From 9f30c9ade5c7d70669849f69bc083fc6ce966420 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 8 Sep 2014 14:58:23 -0300
Subject: [PATCH] fix more tests en wallet f

---
 js/models/core/WalletFactory.js | 13 +++++++------
 test/test.WalletFactory.js      | 11 +++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/js/models/core/WalletFactory.js b/js/models/core/WalletFactory.js
index 4ba0ed31a..eca5e656b 100644
--- a/js/models/core/WalletFactory.js
+++ b/js/models/core/WalletFactory.js
@@ -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);
       });
diff --git a/test/test.WalletFactory.js b/test/test.WalletFactory.js
index 5148734cf..36c032b80 100644
--- a/test/test.WalletFactory.js
+++ b/test/test.WalletFactory.js
@@ -153,7 +153,7 @@ describe('WalletFactory model', function() {
   });
 
 
-  it.only('should be able to get wallets', function(done) {
+  it('should be able to get wallets', function(done) {
     var wf = new WalletFactory(config, '0.0.1');
     wf.create(null, function(err,w){
       wf.read(w.id, [], function(err, w2){
@@ -273,7 +273,7 @@ describe('WalletFactory model', function() {
     }).should.throw();
   });
 
-  it('BIP32 length problem', function() {
+  it('BIP32 length problem', function(done) {
     var sconfig = {
       Network: FakeNetwork,
       Blockchain: FakeBlockchain,
@@ -312,8 +312,11 @@ describe('WalletFactory model', function() {
       'requiredCopayers': 2,
       'totalCopayers': 3
     };
-    var w = wf.create(opts);
-
+    wf.create(opts, function(err,w){
+      should.not.exist(err);
+      should.exist(w);
+      done();
+    });
   });
 
   it('should be able to get current wallets', function() {