diff options
| author | Carl Dong <contact@carldong.me> | 2021-03-16 19:32:10 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2021-03-24 15:40:56 -0400 |
| commit | eede0647b06b6009080c4e536a2705e911d6ee19 (patch) | |
| tree | 93f730c4b9a61ce2a52679c92c1b288e4a530225 /src/test/util | |
| parent | 0c1b2bc549aec77b247f0103652d883227841ac5 (diff) | |
| download | bitcoin-eede0647b06b6009080c4e536a2705e911d6ee19.tar.xz | |
Revert "scripted-diff: Invoke CreateNewBlock with chainstate"
This reverts commit 46b7f29340acb399fbd2378508a204d8d8ee8fca.
Diffstat (limited to 'src/test/util')
| -rw-r--r-- | src/test/util/mining.cpp | 2 | ||||
| -rw-r--r-- | src/test/util/setup_common.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/util/mining.cpp b/src/test/util/mining.cpp index ba1edba0ae..0c6487fbfa 100644 --- a/src/test/util/mining.cpp +++ b/src/test/util/mining.cpp @@ -42,7 +42,7 @@ std::shared_ptr<CBlock> PrepareBlock(const NodeContext& node, const CScript& coi { auto block = std::make_shared<CBlock>( BlockAssembler{*Assert(node.mempool), Params()} - .CreateNewBlock(::ChainstateActive(), coinbase_scriptPubKey) + .CreateNewBlock(coinbase_scriptPubKey) ->block); LOCK(cs_main); diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index f866c2a1f9..ebdde79c85 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -244,7 +244,7 @@ CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransa { const CChainParams& chainparams = Params(); CTxMemPool empty_pool; - CBlock block = BlockAssembler(empty_pool, chainparams).CreateNewBlock(::ChainstateActive(), scriptPubKey)->block; + CBlock block = BlockAssembler(empty_pool, chainparams).CreateNewBlock(scriptPubKey)->block; Assert(block.vtx.size() == 1); for (const CMutableTransaction& tx : txns) { |