status-im/embark-area-51
2
0
Fork 0
mirror of https://github.com/status-im/embark-area-51.git synced 2025-02-15 00:36:46 +00:00
Code Issues Projects Releases Wiki Activity

wip fixes

Browse Source
This commit is contained in:
Jonathan Rainville 2018-06-29 17:09:19 -04:00 committed by Iuri Matias
parent bc3143ce62
commit 7467494591
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/modules/blockchain_process/blockchain.js
View File

@ -45,7 +45,7 @@ var Blockchain = function(options) {
whisper: (this.blockchainConfig.whisper === undefined) || this.blockchainConfig.whisper, whisper: (this.blockchainConfig.whisper === undefined) || this.blockchainConfig.whisper,
maxpeers: ((this.blockchainConfig.maxpeers === 0) ? 0 : (this.blockchainConfig.maxpeers || 25)), maxpeers: ((this.blockchainConfig.maxpeers === 0) ? 0 : (this.blockchainConfig.maxpeers || 25)),
bootnodes: this.blockchainConfig.bootnodes || "", bootnodes: this.blockchainConfig.bootnodes || "",
rpcApi: (this.blockchainConfig.rpcApi || ['eth', 'web3', 'net', 'debug']), rpcApi: (this.blockchainConfig.rpcApi || ['eth', 'web3', 'net', 'debug', 'pubsub']),
wsRPC: (this.blockchainConfig.wsRPC === undefined) || this.blockchainConfig.wsRPC, wsRPC: (this.blockchainConfig.wsRPC === undefined) || this.blockchainConfig.wsRPC,
wsHost: dockerHostSwap(this.blockchainConfig.wsHost) || defaultHost, wsHost: dockerHostSwap(this.blockchainConfig.wsHost) || defaultHost,
wsPort: this.blockchainConfig.wsPort || 8546, wsPort: this.blockchainConfig.wsPort || 8546,

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

@ -3,6 +3,11 @@ const SimpleStorage = require('Embark/contracts/SimpleStorage');
let accounts; let accounts;
config({ config({
deployment: {
type: 'ws',
host: 'localhost',
port: '8546'
},
contracts: { contracts: {
"SimpleStorage": { "SimpleStorage": {
args: [100], args: [100],
@ -45,7 +50,10 @@ contract("SimpleStorage", function () {
done(error); done(error);
}); });
SimpleStorage.methods.set2(150, 100).send(); console.log('TEST');
SimpleStorage.methods.set2(150, 100).send(() => {
console.log('Done');
});
}); });
}); });