embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

conflict with indents

This commit is contained in:
Jonathan Rainville 2018-08-31 08:46:08 -04:00
parent a1c2d7e77a
commit 3e89729331
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/core/modules/coderunner/codeRunner.js
View File

@ -80,8 +80,8 @@ class CodeRunner {
this.ipc.broadcast("runcode:newCommand", {code});
}
if (result instanceof Promise) {
return result.then((value) => cb(null, value)).catch(cb);
if (result instanceof Promise && !result.on) {
return result.then((value) => { cb(null, value); }).catch(cb);
}
cb(null, result);

1
test_apps/test_app/test/simple_storage_spec.js
View File

@ -23,7 +23,6 @@ contract("SimpleStorage", function () {
});
it("set storage value", function (done) {
// await SimpleStorage.methods.set(150).send();
Utils.secureSend(web3, SimpleStorage.methods.set(150), {}, false, async function(err) {
if (err) {
return done(err);