anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix tests

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-06-09 11:41:13 -03:00
commit 5ff8ad236a
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/models/core/Wallet.js
View file

@ -161,7 +161,7 @@ Wallet.prototype._handleData = function(senderId, data, isInbound) {
Wallet.prototype._handleConnect = function(newCopayerId) {
if (newCopayerId) {
this.log('#### Setting new COPAYER:', newCopayerId);
this.currentDelay = this.reconnectDelay;
this.currentDelay = null;
this.sendWalletId(newCopayerId);
}
var peerID = this.network.peerFromCopayer(newCopayerId)
@ -251,6 +251,7 @@ Wallet.prototype.netStart = function() {
if (this.publicKeyRing.isComplete()) {
this._lockIncomming();
}
net.start(startOpts, function() {
self.emit('ready', net.getPeer());
self.token = net.peer.options.token;
@ -265,11 +266,9 @@ Wallet.prototype.netStart = function() {
Wallet.prototype.scheduleConnect = function() {
var self = this;
self.currentDelay = self.currentDelay || self.reconnectDelay;
if (self.network.isOnline()) {
self.connectToAll();
self.currentDelay *=2;
self.currentDelay = self.currentDelay*2 || self.reconnectDelay;
setTimeout(self.scheduleConnect.bind(self), self.currentDelay);
}
}