From dec7ae8a94fc480db3c026cc80673dd95c36b7e0 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Sat, 1 Aug 2015 11:19:21 -0400 Subject: [PATCH] fix blockchain environment --- demo/spec/contracts/simple_storage_spec.js | 2 +- lib/config/contracts.js | 5 +++-- lib/deploy.js | 3 +-- lib/index.js | 2 +- lib/test.js | 2 +- test/config.contracts.js | 8 ++++---- test/deploy.js | 2 +- test/test.js | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/demo/spec/contracts/simple_storage_spec.js b/demo/spec/contracts/simple_storage_spec.js index 9c545f278..359d9d15e 100644 --- a/demo/spec/contracts/simple_storage_spec.js +++ b/demo/spec/contracts/simple_storage_spec.js @@ -5,7 +5,7 @@ Embark.contractsConfig.loadConfigFile('config/contracts.yml'); var files = ["app/contracts/simple_storage.sol"]; -Embark.contractsConfig.init(files); +Embark.contractsConfig.init(files, 'development'); var EmbarkSpec = Embark.tests(files); describe("SimpleStorage", function() { diff --git a/lib/config/contracts.js b/lib/config/contracts.js index aa3bb0142..d95b45770 100644 --- a/lib/config/contracts.js +++ b/lib/config/contracts.js @@ -8,7 +8,7 @@ ContractsConfig = function(blockchainConfig, compiler) { this.contractFiles = []; } -ContractsConfig.prototype.init = function(files) { +ContractsConfig.prototype.init = function(files, env) { this.all_contracts = []; this.contractDB = {}; this.contractFiles = files; @@ -17,7 +17,8 @@ ContractsConfig.prototype.init = function(files) { //TODO: have to specify environment otherwise wouldn't work with staging if (this.blockchainConfig.config != undefined) { - this.blockchainConfig = this.blockchainConfig.config('development'); + //this.blockchainConfig = this.blockchainConfig.config('development'); + this.blockchainConfig = this.blockchainConfig.config(env); } }; diff --git a/lib/deploy.js b/lib/deploy.js index 41fac6def..6237b6e98 100644 --- a/lib/deploy.js +++ b/lib/deploy.js @@ -22,7 +22,7 @@ Deploy = function(env, contractFiles, blockchainConfig, contractsConfig) { throw new Error("==== can't connect to " + this.blockchainConfig.rpcHost + ":" + this.blockchainConfig.rpcPort + " check if an ethereum node is running"); } - console.log("address is : " + primaryAddress); + console.log("primary account address is : " + primaryAddress); }; Deploy.prototype.deploy_contracts = function(env) { @@ -76,7 +76,6 @@ Deploy.prototype.deploy_contracts = function(env) { } var contractAddress = receipt.contractAddress; this.deployedContracts[className] = contractAddress; - console.log('address is ' + contractAddress); console.log("deployed " + className + " at " + contractAddress); } diff --git a/lib/index.js b/lib/index.js index 1668f5e46..25b56b619 100644 --- a/lib/index.js +++ b/lib/index.js @@ -34,7 +34,7 @@ Embark = { }, deployContracts: function(env, contractFiles, destFile) { - this.contractsConfig.init(contractFiles); + this.contractsConfig.init(contractFiles, env); var deploy = new Deploy(env, contractFiles, this.blockchainConfig.config(env), this.contractsConfig); deploy.deploy_contracts(env); return deploy.generate_abi_file(destFile); diff --git a/lib/test.js b/lib/test.js index 4dd11ed1e..6c9572566 100644 --- a/lib/test.js +++ b/lib/test.js @@ -57,7 +57,7 @@ TestContract = function(contract, className, args) { } test = function(contractsConfig, contractFiles) { - contractsConfig.init(contractFiles); + contractsConfig.init(contractFiles, 'development'); contractsConfig.compileContracts(); this.contractDB = contractsConfig.contractDB; diff --git a/test/config.contracts.js b/test/config.contracts.js index bd4fe1350..63f303b9a 100644 --- a/test/config.contracts.js +++ b/test/config.contracts.js @@ -47,7 +47,7 @@ describe('embark.config.contracts', function() { ] contractsConfig = new Config.Contracts(blockchainConfig, compiler); contractsConfig.loadConfigFile('test/support/contracts.yml'); - contractsConfig.init(files); + contractsConfig.init(files, 'development'); contractsConfig.compileContracts(); }); @@ -66,7 +66,7 @@ describe('embark.config.contracts', function() { ] contractsConfig = new Config.Contracts(blockchainConfig, compiler); contractsConfig.loadConfigFile('test/support/arguments.yml'); - contractsConfig.init(files); + contractsConfig.init(files, 'development'); contractsConfig.compileContracts('development'); }); @@ -82,7 +82,7 @@ describe('embark.config.contracts', function() { ] contractsConfig = new Config.Contracts(blockchainConfig, compiler); contractsConfig.loadConfigFile('test/support/instances.yml'); - contractsConfig.init(files); + contractsConfig.init(files, 'development'); contractsConfig.compileContracts('development'); }); @@ -99,7 +99,7 @@ describe('embark.config.contracts', function() { ] contractsConfig = new Config.Contracts(blockchainConfig, compiler); contractsConfig.loadConfigFile('test/support/arguments2.yml'); - contractsConfig.init(files); + contractsConfig.init(files, 'development'); contractsConfig.compileContracts('development'); }); diff --git a/test/deploy.js b/test/deploy.js index f605e7d73..4673dcf95 100644 --- a/test/deploy.js +++ b/test/deploy.js @@ -9,7 +9,7 @@ setDeployConfig = function(config) { var compiler = new Compiler(_blockchainConfig); var contractsConfig = new Config.Contracts(blockchainConfig, compiler); contractsConfig.loadConfigFile(config.contracts); - contractsConfig.init(config.files); + contractsConfig.init(config.files, 'development'); compiler.init('development'); return new Deploy('development', config.files, blockchainConfig, contractsConfig); } diff --git a/test/test.js b/test/test.js index 1d88d346b..2fab351ce 100644 --- a/test/test.js +++ b/test/test.js @@ -14,7 +14,7 @@ describe('embark.test', function() { var compiler = new Compiler(_blockchainConfig); var contractsConfig = new Config.Contracts(blockchainConfig, compiler); contractsConfig.loadConfigFile('test/support/contracts.yml'); - contractsConfig.init(files); + contractsConfig.init(files, 'development'); describe('simple test', function() { var embarkSpec = new Test(contractsConfig, files);