From c4d97243e16585813e231a2ab130524ab84705f6 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 18 Feb 2015 17:14:56 -0300 Subject: [PATCH] better status while incomplete --- lib/client/api.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/client/api.js b/lib/client/api.js index 2783609..e8f7b6f 100644 --- a/lib/client/api.js +++ b/lib/client/api.js @@ -85,13 +85,24 @@ API.prototype._tryToComplete = function(data, cb) { }; -API.prototype._loadAndCheck = function(cb) { + +API.prototype._load = function(cb) { var self = this; this.storage.load(function(err, data) { if (err || !data) { return cb(err || 'Wallet file not found.'); } + return cb(null, data); + }); +}; + + +API.prototype._loadAndCheck = function(cb) { + var self = this; + + this._load(function(err, data) { + if (err) return cb(err); if (data.n > 1) { var pkrComplete = data.publicKeyRing && data.m && data.publicKeyRing.length === data.n; @@ -274,7 +285,7 @@ API.prototype.joinWallet = function(secret, copayerName, cb) { API.prototype.getStatus = function(cb) { var self = this; - this._loadAndCheck(function(err, data) { + this._load(function(err, data) { if (err) return cb(err); var url = '/v1/wallets/';