highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-04 12:55:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove getBlockDepth method from Chain::interface

Browse Source 
Pass conflicting height in CWallet::MarkConflicted
This commit is contained in:
Antoine Riard
2019-04-29 10:18:50 -04:00
parent b66c429c56
commit 36b68de5b2
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/interfaces/chain.cpp
View File

@@ -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);

4
src/interfaces/chain.h
View File

@@ -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;