From e3107c85ac1e2e39cd69e5bc7fd259a77566c419 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Wed, 15 Oct 2014 15:54:17 -0300 Subject: [PATCH] fix delete wallet --- js/models/Identity.js | 1 - js/models/Profile.js | 1 - js/models/Wallet.js | 6 +++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/js/models/Identity.js b/js/models/Identity.js index f025ef1e1..e4ce528a5 100644 --- a/js/models/Identity.js +++ b/js/models/Identity.js @@ -518,7 +518,6 @@ Identity.prototype.listWallets = function() { */ Identity.prototype.deleteWallet = function(walletId, cb) { var self = this; - Identity._walletDelete(walletId, this.storage, function(err) { if (err) return cb(err); self.profile.deleteWallet(walletId, function(err) { diff --git a/js/models/Profile.js b/js/models/Profile.js index e81ef8aad..6753db231 100644 --- a/js/models/Profile.js +++ b/js/models/Profile.js @@ -86,7 +86,6 @@ Profile.prototype.deleteWallet = function(walletId, cb) { return cb(new Error('WNOEXIST: Wallet not on profile ')); delete this.walletInfos[walletId]; - this.store({ overwrite: true }, cb); diff --git a/js/models/Wallet.js b/js/models/Wallet.js index 8d9facd46..840b8a2f9 100644 --- a/js/models/Wallet.js +++ b/js/models/Wallet.js @@ -230,11 +230,11 @@ Wallet.getMaxRequiredCopayers = function(totalCopayers) { */ Wallet.delete = function(walletId, storage, cb) { preconditions.checkArgument(cb); - storage.deletePrefix(Wallet.key(walletId), function(err) { - if (err) return cb(err); + if (err && err.message != 'not found') return cb(err); storage.deletePrefix(walletId + '::', function(err) { - return cb(err); + if (err && err.message != 'not found') return cb(err); + return cb(); }); }); };