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

fix more tests en wallet f

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-09-08 14:58:23 -03:00
commit 9f30c9ade5
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -151,7 +151,7 @@ WalletFactory.prototype.import = function(base64, password, skipFields) {
* @return {Wallet}
*/
WalletFactory.prototype.read = function(walletId, skipFields, cb) {
var self = this;
var self = this, err;
var obj = {};
obj.id = walletId;
@ -159,7 +159,7 @@ WalletFactory.prototype.read = function(walletId, skipFields, cb) {
for (var ii in ret) {
obj[ii] = ret[ii];
}
return cb(self.fromObj(obj, skipFields));
return cb(err, self.fromObj(obj, skipFields));
});
};
@ -271,11 +271,12 @@ WalletFactory.prototype._checkVersion = function(inVersion) {
*/
WalletFactory.prototype.open = function(walletId, passphrase, cb) {
preconditions.checkArgument(cb);
var self = this,
err;
var self = this;
self.storage._setPassphrase(passphrase);
self.read(walletId, null, function(w) {
w.store(function() {
self.read(err, walletId, null, function(w) {
if (err) return cb(err);
w.store(function(err) {
self.storage.setLastOpened(walletId, function() {
return cb(err, w);
});