diff options
| author | MarcoFalke <[email protected]> | 2019-12-16 16:02:53 -0500 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2019-12-16 16:05:06 -0500 |
| commit | 48d64d73c06f4d5db3ad35bed87388ff0795d511 (patch) | |
| tree | a38549f55e4108b7a95cf0d64f1283296c99ee5e /src/node/coin.cpp | |
| parent | Merge #17752: doc: fix directory path for secp256k1 subtree in developer-notes (diff) | |
| parent | rest: Use mempool from node context instead of global (diff) | |
| download | discoin-48d64d73c06f4d5db3ad35bed87388ff0795d511.tar.xz discoin-48d64d73c06f4d5db3ad35bed87388ff0795d511.zip | |
Merge #17564: rpc: Use mempool from node context instead of global
fa8e650b525e9493bdfa393c0c3e34cb22c78c08 rest: Use mempool from node context instead of global (MarcoFalke)
fa660d65d7cc401ad5bbfdc076a074de19a79329 node: Use mempool from node context instead of global (MarcoFalke)
facbaf092f1ab298943206603cff6e6e3d30d452 rpc: Use mempool from node context instead of global (MarcoFalke)
Pull request description:
Currently they are identical, but in the future we might want to turn
the mempool into a unique_ptr. Replacing the global with the mempool
pointer from the node context simplifies this step.
ACKs for top commit:
jnewbery:
Code review ACK fa8e650b5
ryanofsky:
Code review ACK fa8e650b525e9493bdfa393c0c3e34cb22c78c08, Only the discussed REST server changes since the last review.
Tree-SHA512: 0836f3f39cf90306455962918446e5f8612e88c32072b92afc30929aea1f17430bbda0e2b3668d36c9d6b97d63a93cf4903185194571108642b7bf5a39b89125
Diffstat (limited to 'src/node/coin.cpp')
| -rw-r--r-- | src/node/coin.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/node/coin.cpp b/src/node/coin.cpp index ad8d1d3af..f4f86cdbe 100644 --- a/src/node/coin.cpp +++ b/src/node/coin.cpp @@ -4,14 +4,16 @@ #include <node/coin.h> +#include <node/context.h> #include <txmempool.h> #include <validation.h> -void FindCoins(std::map<COutPoint, Coin>& coins) +void FindCoins(const NodeContext& node, std::map<COutPoint, Coin>& coins) { - LOCK2(cs_main, ::mempool.cs); + assert(node.mempool); + LOCK2(cs_main, node.mempool->cs); CCoinsViewCache& chain_view = ::ChainstateActive().CoinsTip(); - CCoinsViewMemPool mempool_view(&chain_view, ::mempool); + CCoinsViewMemPool mempool_view(&chain_view, *node.mempool); for (auto& coin : coins) { if (!mempool_view.GetCoin(coin.first, coin.second)) { // Either the coin is not in the CCoinsViewCache or is spent. Clear it. |