aboutsummaryrefslogtreecommitdiff
path: root/src/test/miner_tests.cpp
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-12-17 07:11:44 +0700
committerMarcoFalke <falke.marco@gmail.com>2019-12-23 06:12:10 +0700
commitfaa92a2297b4a6aebdd58d1818c428f1c0346078 (patch)
tree37b1d8636d450c7887d36ce67074fdb5e97fb4b4 /src/test/miner_tests.cpp
parent6666ef13f167cfe880c2e94c09d003594d010cf3 (diff)
downloadbitcoin-faa92a2297b4a6aebdd58d1818c428f1c0346078.tar.xz
rpc: Remove mempool global from miner
Diffstat (limited to 'src/test/miner_tests.cpp')
-rw-r--r--src/test/miner_tests.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 2b08e6a36c..9f3ca87206 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -30,6 +30,7 @@ struct MinerTestingSetup : public TestingSetup {
{
return CheckSequenceLocks(*m_node.mempool, tx, flags);
}
+ BlockAssembler AssemblerForTest(const CChainParams& params);
};
} // namespace miner_tests
@@ -48,12 +49,13 @@ private:
static CFeeRate blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE);
-static BlockAssembler AssemblerForTest(const CChainParams& params) {
+BlockAssembler MinerTestingSetup::AssemblerForTest(const CChainParams& params)
+{
BlockAssembler::Options options;
options.nBlockMaxWeight = MAX_BLOCK_WEIGHT;
options.blockMinFeeRate = blockMinFeeRate;
- return BlockAssembler(params, options);
+ return BlockAssembler(*m_node.mempool, params, options);
}
constexpr static struct {