test: Pass empty tx pool to block assembler

MarcoFalke · MarcoFalke · commit fa11ff29803c · 2020-08-21T18:44:50.000+02:00
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -215,10 +215,10 @@ TestChain100Setup::TestChain100Setup()
 CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey)
 {
     const CChainParams& chainparams = Params();
-    CBlock block = BlockAssembler(*m_node.mempool, chainparams).CreateNewBlock(scriptPubKey)->block;
+    CTxMemPool empty_pool;
+    CBlock block = BlockAssembler(empty_pool, chainparams).CreateNewBlock(scriptPubKey)->block;
 
-    // Replace mempool-selected txns with just coinbase plus passed-in txns:
-    block.vtx.resize(1);
+    Assert(block.vtx.size() == 1);
     for (const CMutableTransaction& tx : txns) {
         block.vtx.push_back(MakeTransactionRef(tx));
     }

Original file line number	Diff line number	Diff line change
`@@ -215,10 +215,10 @@ TestChain100Setup::TestChain100Setup()`
`215`	`215`	`CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey)`
`216`	`216`	`{`
`217`	`217`	`const CChainParams& chainparams = Params();`
`218`		`- CBlock block = BlockAssembler(*m_node.mempool, chainparams).CreateNewBlock(scriptPubKey)->block;`
	`218`	`+ CTxMemPool empty_pool;`
	`219`	`+ CBlock block = BlockAssembler(empty_pool, chainparams).CreateNewBlock(scriptPubKey)->block;`
`219`	`220`
`220`		`- // Replace mempool-selected txns with just coinbase plus passed-in txns:`
`221`		`- block.vtx.resize(1);`
	`221`	`+ Assert(block.vtx.size() == 1);`
`222`	`222`	`for (const CMutableTransaction& tx : txns) {`
`223`	`223`	`block.vtx.push_back(MakeTransactionRef(tx));`
`224`	`224`	`}`