Skip to content

Fix afterDeploy in build and also build files #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 14, 2018
Merged

Fix afterDeploy in build and also build files #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
faaefd3
fix afterDeploy not done and also waits for file build
jrainville Jun 14, 2018
cb8fd1c
fix possible double callback
jrainville Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions lib/contracts/deploy_manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,22 @@ class DeployManager {
return callback(new Error("error running afterDeploy"));
}

// TODO: convert to for to avoid repeated callback
for(let cmd of onDeployCode) {
async.each(onDeployCode, (cmd, eachCb) => {
self.logger.info("executing: " + cmd);
try {
RunCode.doEval(cmd, web3);
} 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 callback(new Error(e));
return eachCb(new Error(e));
}
}
eachCb();
}, (err) => {
callback(err, contractsManager);
});


callback(null, contractsManager);
}
], function (err, result) {
if (err) {
Expand Down
9 changes: 8 additions & 1 deletion lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,20 @@ class Embark {
engine.deployManager.deployContracts(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) {
engine.logger.error(err.message);
engine.logger.debug(err.stack);
} else {
engine.logger.info("finished building".underline);
engine.logger.info("Finished building".underline);
}
// needed due to child processes
process.exit();
Expand Down