diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-11-22 16:24:38 -0500 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-12-05 14:22:05 -0500 |
commit | fa660d65d7cc401ad5bbfdc076a074de19a79329 (patch) | |
tree | e66d5323bd671bbfdec809b28775d8bf5d56ba8f /src/interfaces | |
parent | facbaf092f1ab298943206603cff6e6e3d30d452 (diff) |
node: Use mempool from node context instead of global
Diffstat (limited to 'src/interfaces')
-rw-r--r-- | src/interfaces/chain.cpp | 2 | ||||
-rw-r--r-- | src/interfaces/node.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp index 26856a00d3..ac640aa35a 100644 --- a/src/interfaces/chain.cpp +++ b/src/interfaces/chain.cpp @@ -263,7 +263,7 @@ public: } return true; } - void findCoins(std::map<COutPoint, Coin>& coins) override { return FindCoins(coins); } + void findCoins(std::map<COutPoint, Coin>& coins) override { return FindCoins(m_node, coins); } double guessVerificationProgress(const uint256& block_hash) override { LOCK(cs_main); diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp index 1877c92178..24695c1afc 100644 --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -167,8 +167,8 @@ public: } int64_t getTotalBytesRecv() override { return m_context.connman ? m_context.connman->GetTotalBytesRecv() : 0; } int64_t getTotalBytesSent() override { return m_context.connman ? m_context.connman->GetTotalBytesSent() : 0; } - size_t getMempoolSize() override { return ::mempool.size(); } - size_t getMempoolDynamicUsage() override { return ::mempool.DynamicMemoryUsage(); } + size_t getMempoolSize() override { return m_context.mempool ? m_context.mempool->size() : 0; } + size_t getMempoolDynamicUsage() override { return m_context.mempool ? m_context.mempool->DynamicMemoryUsage() : 0; } bool getHeaderTip(int& height, int64_t& block_time) override { LOCK(::cs_main); |