[Cleanup] fix warning in comparisons with nCoinbaseMaturity

random-zebra · random-zebra · commit 22b0b4aba633 · 2020-08-23T18:00:48.000+02:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -1859,7 +1859,7 @@ bool CheckTxInputs(const CTransaction& tx, CValidationState& state, const CCoins
 
         // If prev is coinbase, check that it's matured
         if (coin.IsCoinBase() || coin.IsCoinStake()) {
-            if (nSpendHeight - coin.nHeight < consensus.nCoinbaseMaturity)
+            if ((signed long)nSpendHeight - coin.nHeight < consensus.nCoinbaseMaturity)
                 return state.Invalid(false, REJECT_INVALID, "bad-txns-premature-spend-of-coinbase-coinstake",
                         strprintf("tried to spend coinbase/coinstake at depth %d", nSpendHeight - coin.nHeight));
         }
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -517,7 +517,7 @@ void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMem
                     continue;
                 const CCoins *coins = pcoins->AccessCoins(txin.prevout.hash);
                 if (nCheckFrequency != 0) assert(coins);
-                if (!coins || ((coins->IsCoinBase() || coins->IsCoinStake()) && ((signed long)nMemPoolHeight) - coins->nHeight < (unsigned)Params().GetConsensus().nCoinbaseMaturity)) {
+                if (!coins || ((coins->IsCoinBase() || coins->IsCoinStake()) && ((signed long)nMemPoolHeight) - coins->nHeight < Params().GetConsensus().nCoinbaseMaturity)) {
                     transactionsToRemove.push_back(tx);
                     break;
                 }

Original file line number	Diff line number	Diff line change
`@@ -1859,7 +1859,7 @@ bool CheckTxInputs(const CTransaction& tx, CValidationState& state, const CCoins`
`1859`	`1859`
`1860`	`1860`	`// If prev is coinbase, check that it's matured`
`1861`	`1861`	`if (coin.IsCoinBase() \|\| coin.IsCoinStake()) {`
`1862`		`- if (nSpendHeight - coin.nHeight < consensus.nCoinbaseMaturity)`
	`1862`	`+ if ((signed long)nSpendHeight - coin.nHeight < consensus.nCoinbaseMaturity)`
`1863`	`1863`	`return state.Invalid(false, REJECT_INVALID, "bad-txns-premature-spend-of-coinbase-coinstake",`
`1864`	`1864`	`strprintf("tried to spend coinbase/coinstake at depth %d", nSpendHeight - coin.nHeight));`
`1865`	`1865`	`}`
Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,7 @@ void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMem`
`517`	`517`	`continue;`
`518`	`518`	`const CCoins *coins = pcoins->AccessCoins(txin.prevout.hash);`
`519`	`519`	`if (nCheckFrequency != 0) assert(coins);`
`520`		`- if (!coins \|\| ((coins->IsCoinBase() \|\| coins->IsCoinStake()) && ((signed long)nMemPoolHeight) - coins->nHeight < (unsigned)Params().GetConsensus().nCoinbaseMaturity)) {`
	`520`	`+ if (!coins \|\| ((coins->IsCoinBase() \|\| coins->IsCoinStake()) && ((signed long)nMemPoolHeight) - coins->nHeight < Params().GetConsensus().nCoinbaseMaturity)) {`
`521`	`521`	`transactionsToRemove.push_back(tx);`
`522`	`522`	`break;`
`523`	`523`	`}`