diff options
| author | John Newbery <john@johnnewbery.com> | 2019-11-11 10:43:34 -0500 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2020-03-11 18:38:33 -0400 |
| commit | cdb893443cc16edf974f099b8485e04b3db1b1d7 (patch) | |
| tree | e18f5ecc5fa42220d222a926c47ba702d28bfb44 /src/interfaces | |
| parent | 1168394d759b13af68acec6d5bfa04aaa24561f8 (diff) | |
| download | bitcoin-cdb893443cc16edf974f099b8485e04b3db1b1d7.tar.xz | |
[validation interface] Remove vtxConflicted from BlockConnected
The wallet now uses TransactionRemovedFromMempool to be notified about
conflicted wallet, and no other clients use vtxConflicted.
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/chain.cpp | 6 | ||||
| -rw-r--r-- | src/interfaces/chain.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp index 643bb58d56..d16f4e7ccc 100644 --- a/src/interfaces/chain.cpp +++ b/src/interfaces/chain.cpp @@ -172,11 +172,9 @@ public: { m_notifications->TransactionRemovedFromMempool(tx); } - void BlockConnected(const std::shared_ptr<const CBlock>& block, - const CBlockIndex* index, - const std::vector<CTransactionRef>& tx_conflicted) override + void BlockConnected(const std::shared_ptr<const CBlock>& block, const CBlockIndex* index) override { - m_notifications->BlockConnected(*block, tx_conflicted, index->nHeight); + m_notifications->BlockConnected(*block, index->nHeight); } void BlockDisconnected(const std::shared_ptr<const CBlock>& block, const CBlockIndex* index) override { diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h index 7304f82749..03a600d5a3 100644 --- a/src/interfaces/chain.h +++ b/src/interfaces/chain.h @@ -219,7 +219,7 @@ public: virtual ~Notifications() {} virtual void TransactionAddedToMempool(const CTransactionRef& tx) {} virtual void TransactionRemovedFromMempool(const CTransactionRef& ptx) {} - virtual void BlockConnected(const CBlock& block, const std::vector<CTransactionRef>& tx_conflicted, int height) {} + virtual void BlockConnected(const CBlock& block, int height) {} virtual void BlockDisconnected(const CBlock& block, int height) {} virtual void UpdatedBlockTip() {} virtual void ChainStateFlushed(const CBlockLocator& locator) {} |