mirror of https://github.com/embarklabs/embark.git
fix account selection when it isn't configured; improve error message on tests
This commit is contained in:
parent
fd6af8af2e
commit
a797f8fcf6
|
@ -54,7 +54,8 @@ DeployManager.prototype.deployContracts = function(done) {
|
|||
if (err) {
|
||||
return callback(new Error(err));
|
||||
}
|
||||
var selectedAccount = self.config.blockchainConfig.account.address;
|
||||
var accountConfig = self.config.blockchainConfig.account;
|
||||
var selectedAccount = accountConfig && accountConfig.address;
|
||||
web3.eth.defaultAccount = (selectedAccount || accounts[0]);
|
||||
callback(null, contractsManager, web3);
|
||||
});
|
||||
|
|
|
@ -44,7 +44,8 @@ Engine.prototype.startService = function(serviceName, _options) {
|
|||
throw new Error("unknown service: " + serviceName);
|
||||
}
|
||||
|
||||
this.logger.trace("calling: " + serviceName + "(" + JSON.stringify(options) + ")");
|
||||
// need to be careful with circular references due to passing the web3 object
|
||||
//this.logger.trace("calling: " + serviceName + "(" + JSON.stringify(options) + ")");
|
||||
return service.apply(this, [options]);
|
||||
};
|
||||
|
||||
|
|
|
@ -74,13 +74,20 @@ Test.prototype.deployAll = function(contractsConfig, cb) {
|
|||
self.engine.events.on('abi-contracts-vanila', function(vanillaABI) {
|
||||
callback(null, vanillaABI);
|
||||
});
|
||||
self.engine.deployManager.deployContracts(function() {
|
||||
self.engine.deployManager.deployContracts(function(err, result) {
|
||||
if (err) {
|
||||
console.log(err);
|
||||
callback(err);
|
||||
}
|
||||
});
|
||||
}
|
||||
], function(err, result) {
|
||||
if (err) {
|
||||
throw new Error(err);
|
||||
console.log("got error");
|
||||
process.exit();
|
||||
}
|
||||
// this should be part of the waterfall and not just something done at the
|
||||
// end
|
||||
self.web3.eth.getAccounts(function(err, accounts) {
|
||||
if (err) {
|
||||
throw new Error(err);
|
||||
|
|
Loading…
Reference in New Issue