fix walletlock tests

This commit is contained in:
Matias Alejo Garcia 2014-09-17 12:10:26 -03:00
commit 1ab7a4f8e8
7 changed files with 122 additions and 176 deletions

View file

@ -118,6 +118,10 @@ Storage.prototype.getSessionId = function(cb) {
});
};
Storage.prototype.setSessionId = function(sessionId, cb) {
this.sessionStorage.setItem('sessionId', sessionId, cb);
};
Storage.prototype._key = function(walletId, k) {
return walletId + '::' + k;
};
@ -285,7 +289,10 @@ Storage.prototype.setFromObj = function(walletId, obj, cb) {
for (var k in obj) {
self.set(walletId, k, obj[k], function() {
if (++i == l) {
self.setName(walletId, obj.opts.name, cb);
if (obj.opts.name)
self.setName(walletId, obj.opts.name, cb);
else
return cb();
}
});
}

View file

@ -54,11 +54,13 @@ WalletLock.prototype._isLockedByOther = function(cb) {
WalletLock.prototype._setLock = function(cb) {
preconditions.checkArgument(cb);
preconditions.checkState(this.sessionId);
var self = this;
this.storage.setGlobal(this.key, {
sessionId: this.sessionId,
expireTs: Date.now() + this.timeoutMin * 60 * 1000,
}, function() {
cb(null);
});
};