diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-12-17 07:11:44 +0700 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-12-23 06:12:10 +0700 |
commit | faa92a2297b4a6aebdd58d1818c428f1c0346078 (patch) | |
tree | 37b1d8636d450c7887d36ce67074fdb5e97fb4b4 /src/bench/block_assemble.cpp | |
parent | 6666ef13f167cfe880c2e94c09d003594d010cf3 (diff) | |
download | bitcoin-faa92a2297b4a6aebdd58d1818c428f1c0346078.tar.xz |
rpc: Remove mempool global from miner
Diffstat (limited to 'src/bench/block_assemble.cpp')
-rw-r--r-- | src/bench/block_assemble.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bench/block_assemble.cpp b/src/bench/block_assemble.cpp index 184367e1e5..a113a73828 100644 --- a/src/bench/block_assemble.cpp +++ b/src/bench/block_assemble.cpp @@ -6,6 +6,7 @@ #include <consensus/validation.h> #include <crypto/sha256.h> #include <test/util/mining.h> +#include <test/util/setup_common.h> #include <test/util/wallet.h> #include <txmempool.h> #include <validation.h> @@ -29,7 +30,7 @@ static void AssembleBlock(benchmark::State& state) std::array<CTransactionRef, NUM_BLOCKS - COINBASE_MATURITY + 1> txs; for (size_t b{0}; b < NUM_BLOCKS; ++b) { CMutableTransaction tx; - tx.vin.push_back(MineBlock(SCRIPT_PUB)); + tx.vin.push_back(MineBlock(g_testing_setup->m_node, SCRIPT_PUB)); tx.vin.back().scriptWitness = witness; tx.vout.emplace_back(1337, SCRIPT_PUB); if (NUM_BLOCKS - b >= COINBASE_MATURITY) @@ -46,7 +47,7 @@ static void AssembleBlock(benchmark::State& state) } while (state.KeepRunning()) { - PrepareBlock(SCRIPT_PUB); + PrepareBlock(g_testing_setup->m_node, SCRIPT_PUB); } } |