RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #307 from Bucko13/setpassphrase-fix

Browse Source 
More consistent behavior around setting passphrase on unencrypted wallet
This commit is contained in:
Christopher Jeffrey (JJ) 2017-10-18 22:44:02 -07:00 committed by GitHub
commit a1ec1c255e
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/wallet/wallet.js
View File

@ -366,15 +366,10 @@ Wallet.prototype._removeSharedKey = async function _removeSharedKey(acct, key) {
*/ */
Wallet.prototype.setPassphrase = async function setPassphrase(old, new_) { Wallet.prototype.setPassphrase = async function setPassphrase(old, new_) {
if (new_ == null) { if (old)
new_ = old;
old = null;
}
if (old != null)
await this.decrypt(old); await this.decrypt(old);
if (new_ != null) if (new_)
await this.encrypt(new_); await this.encrypt(new_);
}; };