diff options
| author | Antoine Riard <ariard@student.42.fr> | 2019-04-29 10:18:50 -0400 |
|---|---|---|
| committer | Antoine Riard <ariard@student.42.fr> | 2019-11-06 13:36:43 -0500 |
| commit | 36b68de5b2938722911db900ca299f7008780d01 (patch) | |
| tree | 3791969a005bbd1c2982cb8c2a510a8975cc3b7c | |
| parent | b66c429c56c85fa16c309be0b2bca9c25fdd3e1a (diff) | |
Remove getBlockDepth method from Chain::interface
Pass conflicting height in CWallet::MarkConflicted
| -rw-r--r-- | src/interfaces/chain.cpp | 6 | ||||
| -rw-r--r-- | src/interfaces/chain.h | 4 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp index 0635909cae..26856a00d3 100644 --- a/src/interfaces/chain.cpp +++ b/src/interfaces/chain.cpp @@ -58,12 +58,6 @@ class LockImpl : public Chain::Lock, public UniqueLock<CCriticalSection> } return nullopt; } - int getBlockDepth(const uint256& hash) override - { - const Optional<int> tip_height = getHeight(); - const Optional<int> height = getBlockHeight(hash); - return tip_height && height ? *tip_height - *height + 1 : 0; - } uint256 getBlockHash(int height) override { LockAssertion lock(::cs_main); diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h index e07ec1b371..349af152d5 100644 --- a/src/interfaces/chain.h +++ b/src/interfaces/chain.h @@ -76,10 +76,6 @@ public: //! included in the current chain. virtual Optional<int> getBlockHeight(const uint256& hash) = 0; - //! Get block depth. Returns 1 for chain tip, 2 for preceding block, and - //! so on. Returns 0 for a block not included in the current chain. - virtual int getBlockDepth(const uint256& hash) = 0; - //! Get block hash. Height must be valid or this function will abort. virtual uint256 getBlockHash(int height) = 0; diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 4936e3851b..2bc39ea3d9 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -986,7 +986,7 @@ void CWallet::MarkConflicted(const uint256& hashBlock, int conflicting_height, c auto locked_chain = chain().lock(); LOCK(cs_wallet); - int conflictconfirms = -locked_chain->getBlockDepth(hashBlock); + int conflictconfirms = (m_last_block_processed_height - conflicting_height + 1) * -1; // If number of conflict confirms cannot be determined, this means // that the block is still unknown or not yet part of the main chain, // for example when loading the wallet during a reindex. Do nothing in that |