highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-05 18:52:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

node/ifaces: NodeImpl: Use an accessor for ChainMan

Browse Source
This commit is contained in:
Carl Dong
2021-03-24 14:54:29 -04:00
parent 7e8b5ee814
commit 98c4e252f0
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/node/interfaces.cpp
View File

@@ -65,6 +65,8 @@ namespace node {
namespace { namespace {
class NodeImpl : public Node class NodeImpl : public Node
{ {
private:
ChainstateManager& chainman() { return *Assert(m_context->chainman); }
public: public:
explicit NodeImpl(NodeContext* context) { setContext(context); } explicit NodeImpl(NodeContext* context) { setContext(context); }
void initLogging() override { InitLogging(*Assert(m_context->args)); } void initLogging() override { InitLogging(*Assert(m_context->args)); }
@@ -183,21 +185,28 @@ public:
int getNumBlocks() override int getNumBlocks() override
{ {
LOCK(::cs_main); LOCK(::cs_main);
assert(std::addressof(::ChainActive()) == std::addressof(m_context->chainman->ActiveChain())); assert(std::addressof(::ChainActive()) == std::addressof(chainman().ActiveChain()));
return m_context->chainman->ActiveChain().Height(); return chainman().ActiveChain().Height();
} }
uint256 getBestBlockHash() override uint256 getBestBlockHash() override
{ {
assert(std::addressof(::ChainActive()) == std::addressof(m_context->chainman->ActiveChain())); const CBlockIndex* tip;
const CBlockIndex* tip = WITH_LOCK(::cs_main, return m_context->chainman->ActiveChain().Tip()); {
// TODO: Temporary scope to check correctness of refactored code.
// Should be removed manually after merge of
// https://github.com/bitcoin/bitcoin/pull/20158
LOCK(cs_main);
assert(std::addressof(::ChainActive()) == std::addressof(chainman().ActiveChain()));
tip = chainman().ActiveChain().Tip();
}
return tip ? tip->GetBlockHash() : Params().GenesisBlock().GetHash(); return tip ? tip->GetBlockHash() : Params().GenesisBlock().GetHash();
} }
int64_t getLastBlockTime() override int64_t getLastBlockTime() override
{ {
LOCK(::cs_main); LOCK(::cs_main);
assert(std::addressof(::ChainActive()) == std::addressof(m_context->chainman->ActiveChain())); assert(std::addressof(::ChainActive()) == std::addressof(chainman().ActiveChain()));
if (m_context->chainman->ActiveChain().Tip()) { if (chainman().ActiveChain().Tip()) {
return m_context->chainman->ActiveChain().Tip()->GetBlockTime(); return chainman().ActiveChain().Tip()->GetBlockTime();
} }
return Params().GenesisBlock().GetBlockTime(); // Genesis block's time of current network return Params().GenesisBlock().GetBlockTime(); // Genesis block's time of current network
} }
@@ -206,14 +215,22 @@ public:
const CBlockIndex* tip; const CBlockIndex* tip;
{ {
LOCK(::cs_main); LOCK(::cs_main);
assert(std::addressof(::ChainActive()) == std::addressof(m_context->chainman->ActiveChain())); assert(std::addressof(::ChainActive()) == std::addressof(chainman().ActiveChain()));
tip = m_context->chainman->ActiveChain().Tip(); tip = chainman().ActiveChain().Tip();
} }
return GuessVerificationProgress(Params().TxData(), tip); return GuessVerificationProgress(Params().TxData(), tip);
} }
bool isInitialBlockDownload() override { bool isInitialBlockDownload() override {
assert(std::addressof(::ChainstateActive()) == std::addressof(m_context->chainman->ActiveChainstate())); const CChainState* active_chainstate;
return m_context->chainman->ActiveChainstate().IsInitialBlockDownload(); {
// TODO: Temporary scope to check correctness of refactored code.
// Should be removed manually after merge of
// https://github.com/bitcoin/bitcoin/pull/20158
LOCK(::cs_main);
active_chainstate = &m_context->chainman->ActiveChainstate();
assert(std::addressof(::ChainstateActive()) == std::addressof(*active_chainstate));
}
return active_chainstate->IsInitialBlockDownload();
} }
bool getReindex() override { return ::fReindex; } bool getReindex() override { return ::fReindex; }
bool getImporting() override { return ::fImporting; } bool getImporting() override { return ::fImporting; }
@@ -239,8 +256,8 @@ public:
bool getUnspentOutput(const COutPoint& output, Coin& coin) override bool getUnspentOutput(const COutPoint& output, Coin& coin) override
{ {
LOCK(::cs_main); LOCK(::cs_main);
assert(std::addressof(::ChainstateActive()) == std::addressof(m_context->chainman->ActiveChainstate())); assert(std::addressof(::ChainstateActive()) == std::addressof(chainman().ActiveChainstate()));
return m_context->chainman->ActiveChainstate().CoinsTip().GetCoin(output, coin); return chainman().ActiveChainstate().CoinsTip().GetCoin(output, coin);
} }
WalletClient& walletClient() override WalletClient& walletClient() override
{ {