Merge pull request bcoin-org#307 from Bucko13/setpassphrase-fix

More consistent behavior around setting passphrase on unencrypted wallet
YusukeShimizu · Oct 19, 2017 · a1ec1c2 · a1ec1c2
2 parents 5ba79e4 + 778e118
commit a1ec1c2
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/lib/wallet/wallet.js b/lib/wallet/wallet.js
@@ -366,15 +366,10 @@ Wallet.prototype._removeSharedKey = async function _removeSharedKey(acct, key) {
  */
 
 Wallet.prototype.setPassphrase = async function setPassphrase(old, new_) {
-  if (new_ == null) {
-    new_ = old;
-    old = null;
-  }
-
-  if (old != null)
+  if (old)
     await this.decrypt(old);
 
-  if (new_ != null)
+  if (new_)
     await this.encrypt(new_);
 };