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

Fixing conflicts

This commit is contained in:
Richard Ramos 2018-06-11 16:44:34 -04:00
parent 03483052ea
commit 9e92069667
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cmds/blockchain/blockchain.js
View File

@ -87,18 +87,10 @@ Blockchain.prototype.setupProxy = function() {
let ipcObject = new Ipc({ipcRole: 'client'}); let ipcObject = new Ipc({ipcRole: 'client'});
<<<<<<< HEAD
proxy.serve(ipcObject, this.config.rpcHost, this.config.rpcPort, false); proxy.serve(ipcObject, this.config.rpcHost, this.config.rpcPort, false);
proxy.serve(ipcObject, this.config.wsHost, this.config.wsPort, true); proxy.serve(ipcObject, this.config.wsHost, this.config.wsPort, true);
this.config.rpcPort += 10; this.config.rpcPort += constants.blockchain.servicePortOnProxy;
this.config.wsPort += 10; this.config.wsPort += constants.blockchain.servicePortOnProxy;
=======
proxy.serve(ipcObject, this.config.rpcHost, this.config.rpcPort, false);
proxy.serve(ipcObject, this.config.wsHost, this.config.wsPort, true);
this.config.rpcPort += constants.blockchain.servicePortOnProxy;
this.config.wsPort += constants.blockchain.servicePortOnProxy;
}
>>>>>>> Changes based on code review
}; };
Blockchain.prototype.runCommand = function(cmd, options, callback) { Blockchain.prototype.runCommand = function(cmd, options, callback) {