highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 06:58:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

scripted-diff: rename ZapSelectTx to RemoveTxs

Browse Source 
-BEGIN VERIFY SCRIPT-
sed -i 's/ZapSelectTx/RemoveTxs/g' $(git grep -l 'ZapSelectTx' ./src/wallet)
-END VERIFY SCRIPT-
This commit is contained in:
furszy
2024-02-09 11:45:05 -03:00
parent 83b762845f
commit 9a3c5c8697
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/wallet.cpp
View File

@@ -2311,7 +2311,7 @@ DBErrors CWallet::LoadWallet()
return nLoadWalletRet;
}
util::Result<void> CWallet::ZapSelectTx(std::vector<uint256>& txs_to_remove)
util::Result<void> CWallet::RemoveTxs(std::vector<uint256>& txs_to_remove)
{
AssertLockHeld(cs_wallet);
WalletBatch batch(GetDatabase());
@@ -3951,7 +3951,7 @@ bool CWallet::ApplyMigrationData(MigrationData& data, bilingual_str& error)
watchonly_batch.reset(); // Flush
// Do the removes
if (txids_to_delete.size() > 0) {
if (auto res = ZapSelectTx(txids_to_delete); !res) {
if (auto res = RemoveTxs(txids_to_delete); !res) {
error = _("Error: Could not delete watchonly transactions. ") + util::ErrorString(res);
return false;
}