embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-02-09 04:15:08 +00:00
Code Issues Projects Releases Wiki Activity

fix blockchain environment

Browse Source
This commit is contained in:
Iuri Matias 2015-08-01 11:19:21 -04:00
parent d4aac45ea6
commit dec7ae8a94
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/spec/contracts/simple_storage_spec.js
View File

@ -5,7 +5,7 @@ Embark.contractsConfig.loadConfigFile('config/contracts.yml');
var files = ["app/contracts/simple_storage.sol"]; var files = ["app/contracts/simple_storage.sol"];
Embark.contractsConfig.init(files); Embark.contractsConfig.init(files, 'development');
var EmbarkSpec = Embark.tests(files); var EmbarkSpec = Embark.tests(files);
describe("SimpleStorage", function() { describe("SimpleStorage", function() {

5
lib/config/contracts.js
View File

@ -8,7 +8,7 @@ ContractsConfig = function(blockchainConfig, compiler) {
this.contractFiles = []; this.contractFiles = [];
} }
ContractsConfig.prototype.init = function(files) { ContractsConfig.prototype.init = function(files, env) {
this.all_contracts = []; this.all_contracts = [];
this.contractDB = {}; this.contractDB = {};
this.contractFiles = files; this.contractFiles = files;
@ -17,7 +17,8 @@ ContractsConfig.prototype.init = function(files) {
//TODO: have to specify environment otherwise wouldn't work with staging //TODO: have to specify environment otherwise wouldn't work with staging
if (this.blockchainConfig.config != undefined) { if (this.blockchainConfig.config != undefined) {
this.blockchainConfig = this.blockchainConfig.config('development'); //this.blockchainConfig = this.blockchainConfig.config('development');
this.blockchainConfig = this.blockchainConfig.config(env);
} }
}; };

3
lib/deploy.js
View File

@ -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"); 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) { Deploy.prototype.deploy_contracts = function(env) {
@ -76,7 +76,6 @@ Deploy.prototype.deploy_contracts = function(env) {
} }
var contractAddress = receipt.contractAddress; var contractAddress = receipt.contractAddress;
this.deployedContracts[className] = contractAddress; this.deployedContracts[className] = contractAddress;
console.log('address is ' + contractAddress);
console.log("deployed " + className + " at " + contractAddress); console.log("deployed " + className + " at " + contractAddress);
} }

2
lib/index.js
View File

@ -34,7 +34,7 @@ Embark = {
}, },
deployContracts: function(env, contractFiles, destFile) { 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); var deploy = new Deploy(env, contractFiles, this.blockchainConfig.config(env), this.contractsConfig);
deploy.deploy_contracts(env); deploy.deploy_contracts(env);
return deploy.generate_abi_file(destFile); return deploy.generate_abi_file(destFile);

2
lib/test.js
View File

@ -57,7 +57,7 @@ TestContract = function(contract, className, args) {
} }
test = function(contractsConfig, contractFiles) { test = function(contractsConfig, contractFiles) {
contractsConfig.init(contractFiles); contractsConfig.init(contractFiles, 'development');
contractsConfig.compileContracts(); contractsConfig.compileContracts();
this.contractDB = contractsConfig.contractDB; this.contractDB = contractsConfig.contractDB;

8
test/config.contracts.js
View File

@ -47,7 +47,7 @@ describe('embark.config.contracts', function() {
] ]
contractsConfig = new Config.Contracts(blockchainConfig, compiler); contractsConfig = new Config.Contracts(blockchainConfig, compiler);
contractsConfig.loadConfigFile('test/support/contracts.yml'); contractsConfig.loadConfigFile('test/support/contracts.yml');
contractsConfig.init(files); contractsConfig.init(files, 'development');
contractsConfig.compileContracts(); contractsConfig.compileContracts();
}); });
@ -66,7 +66,7 @@ describe('embark.config.contracts', function() {
] ]
contractsConfig = new Config.Contracts(blockchainConfig, compiler); contractsConfig = new Config.Contracts(blockchainConfig, compiler);
contractsConfig.loadConfigFile('test/support/arguments.yml'); contractsConfig.loadConfigFile('test/support/arguments.yml');
contractsConfig.init(files); contractsConfig.init(files, 'development');
contractsConfig.compileContracts('development'); contractsConfig.compileContracts('development');
}); });
@ -82,7 +82,7 @@ describe('embark.config.contracts', function() {
] ]
contractsConfig = new Config.Contracts(blockchainConfig, compiler); contractsConfig = new Config.Contracts(blockchainConfig, compiler);
contractsConfig.loadConfigFile('test/support/instances.yml'); contractsConfig.loadConfigFile('test/support/instances.yml');
contractsConfig.init(files); contractsConfig.init(files, 'development');
contractsConfig.compileContracts('development'); contractsConfig.compileContracts('development');
}); });
@ -99,7 +99,7 @@ describe('embark.config.contracts', function() {
] ]
contractsConfig = new Config.Contracts(blockchainConfig, compiler); contractsConfig = new Config.Contracts(blockchainConfig, compiler);
contractsConfig.loadConfigFile('test/support/arguments2.yml'); contractsConfig.loadConfigFile('test/support/arguments2.yml');
contractsConfig.init(files); contractsConfig.init(files, 'development');
contractsConfig.compileContracts('development'); contractsConfig.compileContracts('development');
}); });

2
test/deploy.js
View File

@ -9,7 +9,7 @@ setDeployConfig = function(config) {
var compiler = new Compiler(_blockchainConfig); var compiler = new Compiler(_blockchainConfig);
var contractsConfig = new Config.Contracts(blockchainConfig, compiler); var contractsConfig = new Config.Contracts(blockchainConfig, compiler);
contractsConfig.loadConfigFile(config.contracts); contractsConfig.loadConfigFile(config.contracts);
contractsConfig.init(config.files); contractsConfig.init(config.files, 'development');
compiler.init('development'); compiler.init('development');
return new Deploy('development', config.files, blockchainConfig, contractsConfig); return new Deploy('development', config.files, blockchainConfig, contractsConfig);
} }

2
test/test.js
View File

@ -14,7 +14,7 @@ describe('embark.test', function() {
var compiler = new Compiler(_blockchainConfig); var compiler = new Compiler(_blockchainConfig);
var contractsConfig = new Config.Contracts(blockchainConfig, compiler); var contractsConfig = new Config.Contracts(blockchainConfig, compiler);
contractsConfig.loadConfigFile('test/support/contracts.yml'); contractsConfig.loadConfigFile('test/support/contracts.yml');
contractsConfig.init(files); contractsConfig.init(files, 'development');
describe('simple test', function() { describe('simple test', function() {
var embarkSpec = new Test(contractsConfig, files); var embarkSpec = new Test(contractsConfig, files);