Merge #16056: mempool: remove unused magic number from consistency check

laanwj · laanwj · commit de458da0c129 · 2019-05-29T12:22:43.000+02:00
fadbc5d mempool: remove unused magic number from consistency check (Gregory Sanders) Pull request description: Unexplained magic numbers are no good. Since the exact number does not matter, opt for a constant that is less peculiar. Note that this could only possibly affect mempool consistency checks which is not active by default except on regtest. see discussion: bitcoin/bitcoin#15080 ACKs for commit fadbc5: practicalswift: utACK fadbc5d Tree-SHA512: 80f95ebc284c5bcc5d825fab0e9f962457a411539946d68ef4c8bdea4b1f2f7f0ead88928fac0eaaa02a1175f01f5ef381613ce53b0f27c3098e90d76ecfe9af
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -601,7 +601,7 @@ static void CheckInputsAndUpdateCoins(const CTransaction& tx, CCoinsViewCache& m
     CAmount txfee = 0;
     bool fCheckResult = tx.IsCoinBase() || Consensus::CheckTxInputs(tx, state, mempoolDuplicate, spendheight, txfee);
     assert(fCheckResult);
-    UpdateCoins(tx, mempoolDuplicate, 1000000);
+    UpdateCoins(tx, mempoolDuplicate, std::numeric_limits<int>::max());
 }
 
 void CTxMemPool::check(const CCoinsViewCache *pcoins) const

Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ static void CheckInputsAndUpdateCoins(const CTransaction& tx, CCoinsViewCache& m`
`601`	`601`	`CAmount txfee = 0;`
`602`	`602`	`bool fCheckResult = tx.IsCoinBase() \|\| Consensus::CheckTxInputs(tx, state, mempoolDuplicate, spendheight, txfee);`
`603`	`603`	`assert(fCheckResult);`
`604`		`- UpdateCoins(tx, mempoolDuplicate, 1000000);`
	`604`	`+ UpdateCoins(tx, mempoolDuplicate, std::numeric_limits<int>::max());`
`605`	`605`	`}`
`606`	`606`
`607`	`607`	`void CTxMemPool::check(const CCoinsViewCache *pcoins) const`