[test util] lock cs_main before pool.cs in PopulateMempool

glozow · glozow · commit 6ce265acf4ff · 2022-12-22T11:33:44.000Z
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -415,7 +415,7 @@ std::vector<CTransactionRef> TestChain100Setup::PopulateMempool(FastRandomContex
             }
         }
         if (submit) {
-            LOCK2(m_node.mempool->cs, cs_main);
+            LOCK2(cs_main, m_node.mempool->cs);
             LockPoints lp;
             m_node.mempool->addUnchecked(CTxMemPoolEntry(ptx, /*fee=*/(total_in - num_outputs * amount_per_output),
                                                          /*time=*/0, /*entry_height=*/1,

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ std::vector<CTransactionRef> TestChain100Setup::PopulateMempool(FastRandomContex`
`415`	`415`	`}`
`416`	`416`	`}`
`417`	`417`	`if (submit) {`
`418`		`- LOCK2(m_node.mempool->cs, cs_main);`
	`418`	`+ LOCK2(cs_main, m_node.mempool->cs);`
`419`	`419`	`LockPoints lp;`
`420`	`420`	`m_node.mempool->addUnchecked(CTxMemPoolEntry(ptx, /fee=/(total_in - num_outputs * amount_per_output),`
`421`	`421`	`/time=/0, /entry_height=/1,`