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

mocha test passing on console

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-08-15 09:57:47 -04:00
commit eb9acb958f
7 changed files with 185 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1670,7 +1670,7 @@ Wallet.prototype.indexDiscovery = function(start, change, cosigner, gap, cb) {
Wallet.prototype.disconnect = function() {
this.log('## DISCONNECTING');
this.unlock();
this.lock.release();
this.network.disconnect();
};

2
js/models/core/WalletFactory.js
View file

@ -170,7 +170,7 @@ WalletFactory.prototype._checkNetwork = function(inNetworkName) {
WalletFactory.prototype.open = function(walletId, passphrase) {
this.storage._setPassphrase(passphrase);
var w = this.read(walletId, opts);
var w = this.read(walletId);
if (w)
w.store();

15
js/models/storage/LocalEncrypted.js
View file

@ -141,7 +141,7 @@ Storage.prototype.getWalletIds = function() {
if (split.length == 2) {
var walletId = split[0];
if (walletId === 'nameFor' || walletId === 'lock')
if (!walletId || walletId === 'nameFor')
continue;
if (typeof uniq[walletId] === 'undefined') {
@ -190,19 +190,6 @@ Storage.prototype.getLastOpened = function() {
return this.getGlobal('lastOpened');
}
// Lock related
Storage.prototype.setLock = function(walletId) {
this.setGlobal(this._key(walletId, 'Lock'), this.sessionId());
}
Storage.prototype.getLock = function(walletId) {
return this.getGlobal(this._key(walletId, 'Lock'));
}
Storage.prototype.removeLock = function(walletId) {
this.removeGlobal(this._key(walletId, 'Lock'));
}
//obj contains keys to be set
Storage.prototype.setFromObj = function(walletId, obj) {
for (var k in obj) {