status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #530 from embark-framework/bug_fix/after-deploy-dev 

Add file build to embark build and fix afterDeploy
This commit is contained in:
Iuri Matias 2018-06-14 12:11:16 -04:00 committed by GitHub
parent 502788c7e0 a62a74d162
commit 9a261681da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/coderunner/codeRunner.js
View File

@ -15,10 +15,16 @@ class CodeRunner {
});
this.events.setCommandHandler('runcode:eval', (code, cb) => {
let result = RunCode.doEval(code);
if (cb) {
cb(null, result);
if (!cb) {
cb = function() {};
}
try {
let result = RunCode.doEval(code);
cb(null, result);
} catch (e) {
cb(e);
}
});
}
}

7
lib/index.js
View File

@ -203,6 +203,13 @@ class Embark {
engine.events.request('deploy:contracts', function(err) {
callback(err);
});
},
function waitForWriteFinish(callback) {
engine.logger.info("Finished deploying".underline);
// Necessary log for simple projects. This event is trigger to soon because there is no file
// Also, not exiting straight after the deploy leaves time for async afterDeploys to finish
engine.logger.info("If you have no files to build, you can exit now with CTRL+C");
engine.events.on('outputDone', callback);
}
], function (err, _result) {
if (err) {

47
lib/modules/specialconfigs/index.js
View File

@ -52,30 +52,30 @@ class SpecialConfigs {
async.mapLimit(afterDeployCmds, 1, (cmd, nextMapCb) => {
self.replaceWithAddresses(cmd, nextMapCb);
}, (err, result) => {
}, (err, onDeployCode) => {
if (err) {
self.logger.trace(err);
return cb(new Error("error running afterDeploy"));
}
let onDeployCode = result;
// TODO: convert to for to avoid repeated callback
for(let cmd of onDeployCode) {
self.logger.info("==== executing: " + cmd);
try {
self.events.request('runcode:eval', cmd);
} catch(e) {
if (e.message.indexOf("invalid opcode") >= 0) {
self.logger.error('the transaction was rejected; this usually happens due to a throw or a require, it can also happen due to an invalid operation');
}
return cb(new Error(e));
}
}
cb();
self.runOnDeployCode(onDeployCode, cb);
});
});
}
runOnDeployCode(onDeployCode, callback) {
const self = this;
async.each(onDeployCode, (cmd, eachCb) => {
self.logger.info("==== executing: " + cmd);
self.events.request('runcode:eval', cmd, (err) => {
if (err && err.message.indexOf("invalid opcode") >= 0) {
self.logger.error('the transaction was rejected; this usually happens due to a throw or a require, it can also happen due to an invalid operation');
}
eachCb(err);
});
}, callback);
}
registerOnDeployAction() {
const self = this;
@ -92,25 +92,12 @@ class SpecialConfigs {
async.mapLimit(onDeployCmds, 1, (cmd, nextMapCb) => {
self.replaceWithAddresses(cmd, nextMapCb);
}, (err, result) => {
}, (err, onDeployCode) => {
if (err) {
return cb(new Error("error running onDeploy for " + contract.className.cyan));
}
let onDeployCode = result;
// TODO: convert to for to avoid repeated callback
for(let cmd of onDeployCode) {
self.logger.info("==== executing: " + cmd);
try {
self.events.request('runcode:eval', cmd);
} catch(e) {
if (e.message.indexOf("invalid opcode") >= 0) {
self.logger.error('the transaction was rejected; this usually happens due to a throw or a require, it can also happen due to an invalid operation');
}
return cb(new Error(e));
}
}
cb();
self.runOnDeployCode(onDeployCode, cb);
});
});
}