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

Fixes: tests. Added karma and mocha tests.

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-07 20:07:41 -03:00
commit 8ad1fa7b02
7 changed files with 40 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,6 +43,7 @@ function Wallet(opts) {
this.id = opts.id || Wallet.getRandomId();
this.name = opts.name;
this.isLocked = false;
this.verbose = opts.verbose;
this.publicKeyRing.walletId = this.id;
@ -431,7 +432,6 @@ Wallet.prototype.netStart = function(callback) {
var self = this;
var net = this.network;
this._checkLocked();
net.removeAllListeners();
net.on('connect', self._handleConnect.bind(self));
@ -464,6 +464,7 @@ Wallet.prototype.netStart = function(callback) {
self.scheduleConnect();
self.emit('txProposalsUpdated');
}, 10);
self._checkLocked();
});
};
@ -1017,6 +1018,9 @@ Wallet.prototype.indexDiscovery = function(start, change, cosigner, gap, cb) {
Wallet.prototype.disconnect = function() {
this.log('## DISCONNECTING');
if (!this.isLocked) {
this.closeIfOpen();
}
this.network.disconnect();
};