Remove mempool transactions which commit to an unmineable branch ID

2018-02-09 23:16:55 +00:00
parent 233c9eb635
commit 34a64fe0a2
10 changed files with 233 additions and 8 deletions
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -106,7 +106,8 @@ TestingSetup::~TestingSetup()

 CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CMutableTransaction &tx, CTxMemPool *pool) {
    return CTxMemPoolEntry(tx, nFee, nTime, dPriority, nHeight,
-                           pool ? pool->HasNoInputsOf(tx) : hadNoDependencies, spendsCoinbase);
+                           pool ? pool->HasNoInputsOf(tx) : hadNoDependencies,
+                           spendsCoinbase, nBranchId);
 }

 void Shutdown(void* parg)