diff options
author | Antoine Riard <ariard@student.42.fr> | 2019-07-15 18:20:12 -0400 |
---|---|---|
committer | Antoine Riard <ariard@student.42.fr> | 2020-04-30 14:37:21 -0400 |
commit | de13363a472ea30dff2f8f55c6ae572281115380 (patch) | |
tree | 7e220b1927512f48b0c39d6c0120e6e99e22074b /src/interfaces | |
parent | b855592d835bf4b3fb1263b88d4f96669a1722b1 (diff) | |
download | bitcoin-de13363a472ea30dff2f8f55c6ae572281115380.tar.xz |
[wallet] Move getBlockHeight from Chain::Lock interface to simple Chain
Add HaveChain to assert chain access for wallet-tool in LoadToWallet.
Diffstat (limited to 'src/interfaces')
-rw-r--r-- | src/interfaces/chain.cpp | 18 | ||||
-rw-r--r-- | src/interfaces/chain.h | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp index b891cf2ee5..ccdbf1f1d1 100644 --- a/src/interfaces/chain.cpp +++ b/src/interfaces/chain.cpp @@ -55,15 +55,6 @@ bool FillBlock(const CBlockIndex* index, const FoundBlock& block, UniqueLock<Rec class LockImpl : public Chain::Lock, public UniqueLock<RecursiveMutex> { - Optional<int> getBlockHeight(const uint256& hash) override - { - LockAssertion lock(::cs_main); - CBlockIndex* block = LookupBlockIndex(hash); - if (block && ::ChainActive().Contains(block)) { - return block->nHeight; - } - return nullopt; - } uint256 getBlockHash(int height) override { LockAssertion lock(::cs_main); @@ -234,6 +225,15 @@ public: } return nullopt; } + Optional<int> getBlockHeight(const uint256& hash) override + { + LOCK(::cs_main); + CBlockIndex* block = LookupBlockIndex(hash); + if (block && ::ChainActive().Contains(block)) { + return block->nHeight; + } + return nullopt; + } bool findBlock(const uint256& hash, const FoundBlock& block) override { WAIT_LOCK(cs_main, lock); diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h index 03635fd74f..b85484c11b 100644 --- a/src/interfaces/chain.h +++ b/src/interfaces/chain.h @@ -87,11 +87,6 @@ public: public: virtual ~Lock() {} - //! Get block height above genesis block. Returns 0 for genesis block, - //! 1 for following block, and so on. Returns nullopt for a block not - //! included in the current chain. - virtual Optional<int> getBlockHeight(const uint256& hash) = 0; - //! Get block hash. Height must be valid or this function will abort. virtual uint256 getBlockHash(int height) = 0; @@ -135,6 +130,11 @@ public: //! any blocks) virtual Optional<int> getHeight() = 0; + //! Get block height above genesis block. Returns 0 for genesis block, + //! 1 for following block, and so on. Returns nullopt for a block not + //! included in the current chain. + virtual Optional<int> getBlockHeight(const uint256& hash) = 0; + //! Return whether node has the block and optionally return block metadata //! or contents. virtual bool findBlock(const uint256& hash, const FoundBlock& block={}) = 0; |