From 55696a0ac30bcfbd555f71cbc8eac23b725f7dcf Mon Sep 17 00:00:00 2001
From: w0xlt <woltx@protonmail.com>
Date: Mon, 26 Dec 2022 06:17:05 -0300
Subject: wallet: remove `mempool_sequence` from
 `transactionRemovedFromMempool`

---
 src/interfaces/chain.h  | 2 +-
 src/node/interfaces.cpp | 2 +-
 src/wallet/wallet.cpp   | 4 ++--
 src/wallet/wallet.h     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h
index a713371b98..9864e2075f 100644
--- a/src/interfaces/chain.h
+++ b/src/interfaces/chain.h
@@ -269,7 +269,7 @@ public:
     public:
         virtual ~Notifications() {}
         virtual void transactionAddedToMempool(const CTransactionRef& tx) {}
-        virtual void transactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason, uint64_t mempool_sequence) {}
+        virtual void transactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason) {}
         virtual void blockConnected(const BlockInfo& block) {}
         virtual void blockDisconnected(const BlockInfo& block) {}
         virtual void updatedBlockTip() {}
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index bc4e0ce110..a693c8054c 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -424,7 +424,7 @@ public:
     }
     void TransactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason, uint64_t mempool_sequence) override
     {
-        m_notifications->transactionRemovedFromMempool(tx, reason, mempool_sequence);
+        m_notifications->transactionRemovedFromMempool(tx, reason);
     }
     void BlockConnected(const std::shared_ptr<const CBlock>& block, const CBlockIndex* index) override
     {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 4bcef6996e..d4718e82df 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1365,7 +1365,7 @@ void CWallet::transactionAddedToMempool(const CTransactionRef& tx) {
     }
 }
 
-void CWallet::transactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason, uint64_t mempool_sequence) {
+void CWallet::transactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason) {
     LOCK(cs_wallet);
     auto it = mapWallet.find(tx->GetHash());
     if (it != mapWallet.end()) {
@@ -1411,7 +1411,7 @@ void CWallet::blockConnected(const interfaces::BlockInfo& block)
     m_last_block_processed = block.hash;
     for (size_t index = 0; index < block.data->vtx.size(); index++) {
         SyncTransaction(block.data->vtx[index], TxStateConfirmed{block.hash, block.height, static_cast<int>(index)});
-        transactionRemovedFromMempool(block.data->vtx[index], MemPoolRemovalReason::BLOCK, /*mempool_sequence=*/0);
+        transactionRemovedFromMempool(block.data->vtx[index], MemPoolRemovalReason::BLOCK);
     }
 }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 99b1501f8d..fe3065b1b7 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -538,7 +538,7 @@ public:
         uint256 last_failed_block;
     };
     ScanResult ScanForWalletTransactions(const uint256& start_block, int start_height, std::optional<int> max_height, const WalletRescanReserver& reserver, bool fUpdate, const bool save_progress);
-    void transactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason, uint64_t mempool_sequence) override;
+    void transactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason) override;
     /** Set the next time this wallet should resend transactions to 12-36 hours from now, ~1 day on average. */
     void SetNextResend() { m_next_resend = GetDefaultNextResend(); }
     /** Return true if all conditions for periodically resending transactions are met. */
-- 
cgit v1.2.3