diff options
| author | fanquake <fanquake@gmail.com> | 2021-06-29 09:50:14 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-06-29 11:22:57 +0800 |
| commit | 8071ec179d75cefd41dac2a9a248eaf38054b85d (patch) | |
| tree | 7f30c636e2c48684e287620fa4cf6441463e4e81 /src/test/interfaces_tests.cpp | |
| parent | 3f56ef7bef22f0c8c94ad7e401d50b188dae2cbe (diff) | |
| parent | fa0d9211ef87a682573aaae932c0c440acbcb8a8 (diff) | |
| download | bitcoin-8071ec179d75cefd41dac2a9a248eaf38054b85d.tar.xz | |
Merge bitcoin/bitcoin#21789: refactor: Remove ::Params() global from CChainState
fa0d9211ef87a682573aaae932c0c440acbcb8a8 refactor: Remove chainparams arg from CChainState member functions (MarcoFalke)
fa389471251f043ec25e7b01e59b37d3b921ce54 refactor: Remove ::Params() global from inside CChainState member functions (MarcoFalke)
Pull request description:
The `::Params()` global is verbose and confusing. Also it makes tests a bit harder to write because they'd have to mock a global.
Fix all issues by simply using a member variable that points to the right params.
(Can be reviewed with `--word-diff-regex=.`)
ACKs for top commit:
jnewbery:
ACK fa0d9211ef87a682573aaae932c0c440acbcb8a8
kiminuo:
utACK fa0d9211
theStack:
ACK fa0d9211ef87a682573aaae932c0c440acbcb8a8 🍉
Tree-SHA512: 44676b19c9ed471ccb536331d3029bad192d7d50f394fd7b8527ec431452aeec8c4494164b9cf8e16e0123c4463b16be864366c6b599370032c17262625a0356
Diffstat (limited to 'src/test/interfaces_tests.cpp')
| -rw-r--r-- | src/test/interfaces_tests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/interfaces_tests.cpp b/src/test/interfaces_tests.cpp index 42a7c7798c..44779f7d7c 100644 --- a/src/test/interfaces_tests.cpp +++ b/src/test/interfaces_tests.cpp @@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE(findCommonAncestor) auto* orig_tip = active.Tip(); for (int i = 0; i < 10; ++i) { BlockValidationState state; - m_node.chainman->ActiveChainstate().InvalidateBlock(state, Params(), active.Tip()); + m_node.chainman->ActiveChainstate().InvalidateBlock(state, active.Tip()); } BOOST_CHECK_EQUAL(active.Height(), orig_tip->nHeight - 10); coinbaseKey.MakeNewKey(true); |