diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index cc3badfef..6c1b0d64e 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -456,7 +456,6 @@ Wallet.prototype.netStart = function(callback) { net.start(startOpts, function() { self.emit('ready', net.getPeer()); - self.fakeConnections(); setTimeout(function() { self.emit('publicKeyRingUpdated', true); //self.scheduleConnect(); @@ -467,17 +466,6 @@ Wallet.prototype.netStart = function(callback) { }; -// TODO temporary method. should remove this when we refactor peerID out -Wallet.prototype.fakeConnections = function() { - var all = this.publicKeyRing.getAllCopayerIds(); - for (var i = 0; i < all.length; i++) { - var copayerID = all[i]; - var peerID = this.network.peerFromCopayer(copayerID); - this.network._addCopayerMap(peerID, copayerID); - } -}; - - // not being used now Wallet.prototype.scheduleConnect = function() { var self = this; diff --git a/js/models/network/Async.js b/js/models/network/Async.js index 0c84f3915..d3a08b331 100644 --- a/js/models/network/Async.js +++ b/js/models/network/Async.js @@ -226,7 +226,7 @@ Network.prototype._onMessage = function(enc) { default: console.log(JSON.stringify(self.copayerForPeer)); console.log('data from '+sender+' '+self.copayerForPeer[sender]); - this.emit('data', self.copayerForPeer[sender], payload); + this.emit('data', sender, payload); } };