diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2019-12-05 18:23:57 -0500 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2019-12-06 15:05:48 -0500 |
| commit | 77a777118eaf78f10a439810d1c08d510a539aa0 (patch) | |
| tree | 3abffca64ce466ec095472740316248f7043e1e8 /src/wallet/wallet.cpp | |
| parent | 35f962fcf0d5107ae6a3a9348e249a9b18ff7106 (diff) | |
Rename EncryptKeys to Encrypt and pass in the encrypted batch to use
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 80dfbb594d..88399bbab6 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -532,8 +532,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase) { LOCK(cs_wallet); mapMasterKeys[++nMasterKeyMaxID] = kMasterKey; - assert(!encrypted_batch); - encrypted_batch = new WalletBatch(*database); + WalletBatch* encrypted_batch = new WalletBatch(*database); if (!encrypted_batch->TxnBegin()) { delete encrypted_batch; encrypted_batch = nullptr; @@ -542,7 +541,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase) encrypted_batch->WriteMasterKey(nMasterKeyMaxID, kMasterKey); if (auto spk_man = m_spk_man.get()) { - if (!spk_man->EncryptKeys(_vMasterKey)) { + if (!spk_man->Encrypt(_vMasterKey, encrypted_batch)) { encrypted_batch->TxnAbort(); delete encrypted_batch; encrypted_batch = nullptr; |