aboutsummaryrefslogtreecommitdiff
path: root/src/node/context.h
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2020-09-07 09:47:14 +0200
committerMarcoFalke <falke.marco@gmail.com>2020-09-07 09:47:28 +0200
commit07087051afe9cd5a66ea3e9c0a05079b1ffff47f (patch)
tree4a6dc9263bfb221450f046ca422ad26b1d474733 /src/node/context.h
parent78cb45d72251e85db07e8500bbdd2e9460b132b2 (diff)
parentfafb381af8279b2d2ca768df0bf68d7eb036a2f9 (diff)
downloadbitcoin-07087051afe9cd5a66ea3e9c0a05079b1ffff47f.tar.xz
Merge #19556: Remove mempool global
fafb381af8279b2d2ca768df0bf68d7eb036a2f9 Remove mempool global (MarcoFalke) fa0359c5b30730744aa8a7cd9ffab79ded91041f Remove mempool global from p2p (MarcoFalke) eeee1104d78eb59a582ee1709ff4ac2c33ee1190 Remove mempool global from init (MarcoFalke) Pull request description: This refactor unlocks some nice potential features, such as, but not limited to: * Removing the fee estimates global (would avoid slightly fragile workarounds such as #18766) * Making the mempool optional for a "blocksonly" operation mode Even absent those features, the new code without the global should be easier to maintain, read and write tests for. ACKs for top commit: jnewbery: utACK fafb381af8279b2d2ca768df0bf68d7eb036a2f9 hebasto: ACK fafb381af8279b2d2ca768df0bf68d7eb036a2f9, I have reviewed the code and it looks OK, I agree it can be merged. darosior: ACK fafb381af8279b2d2ca768df0bf68d7eb036a2f9 Tree-SHA512: a2e696dc377e2e81eaf9c389e6d13dde4a48d81f3538df88f4da502d3012dd61078495140ab5a5854f360a06249fe0e1f6a094c4e006d8b5cc2552a946becf26
Diffstat (limited to 'src/node/context.h')
-rw-r--r--src/node/context.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node/context.h b/src/node/context.h
index 793c9dfc34..d9d0750951 100644
--- a/src/node/context.h
+++ b/src/node/context.h
@@ -35,7 +35,7 @@ class WalletClient;
//! be used without pulling in unwanted dependencies or functionality.
struct NodeContext {
std::unique_ptr<CConnman> connman;
- CTxMemPool* mempool{nullptr}; // Currently a raw pointer because the memory is not managed by this struct
+ std::unique_ptr<CTxMemPool> mempool;
std::unique_ptr<PeerLogicValidation> peer_logic;
ChainstateManager* chainman{nullptr}; // Currently a raw pointer because the memory is not managed by this struct
std::unique_ptr<BanMan> banman;