diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-01-02 17:50:48 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-01-02 17:50:56 -0500 |
| commit | 17e14ac92fced92457945859463eda5d435bdd49 (patch) | |
| tree | 0cab7274ff69d0444220fcd230851b24f2ba405c /src/bench/bench.h | |
| parent | 190a4051fde736faf99681d107f0b38dd385e90c (diff) | |
| parent | faa92a2297b4a6aebdd58d1818c428f1c0346078 (diff) | |
| download | bitcoin-17e14ac92fced92457945859463eda5d435bdd49.tar.xz | |
Merge #17781: rpc: Remove mempool global from miner
faa92a2297b4a6aebdd58d1818c428f1c0346078 rpc: Remove mempool global from miner (MarcoFalke)
6666ef13f167cfe880c2e94c09d003594d010cf3 test: Properly document blockinfo size in miner_tests (MarcoFalke)
Pull request description:
The miner needs read-only access to the mempool. Instead of using the mutable global `::mempool`, keep a immutable reference to a mempool that is passed to the miner. Apart from the obvious benefits of removing a global and making things immutable, this might also simplify testing with multiple mempools.
ACKs for top commit:
promag:
ACK faa92a2297b4a6aebdd58d1818c428f1c0346078.
fjahr:
ACK faa92a2297b4a6aebdd58d1818c428f1c0346078
jnewbery:
Code review ACK faa92a2297b4a6aebdd58d1818c428f1c0346078
Tree-SHA512: c44027b5d2217a724791166f3f3112c45110ac1dbb37bdae27148a0657e0d1a1d043b0d24e49fd45465ec014224d1b7eb15c92a33069ad883fa8ffeadc24735b
Diffstat (limited to 'src/bench/bench.h')
| -rw-r--r-- | src/bench/bench.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bench/bench.h b/src/bench/bench.h index 62de1f9cc7..e2af2a8856 100644 --- a/src/bench/bench.h +++ b/src/bench/bench.h @@ -14,6 +14,9 @@ #include <boost/preprocessor/cat.hpp> #include <boost/preprocessor/stringize.hpp> +struct RegTestingSetup; +extern const RegTestingSetup* g_testing_setup; //!< A pointer to the current testing setup + // Simple micro-benchmarking framework; API mostly matches a subset of the Google Benchmark // framework (see https://github.com/google/benchmark) // Why not use the Google Benchmark framework? Because adding Yet Another Dependency |