wallet: assert to ensure accuracy of CMerkleTx::GetBlocksToMaturity

Empact · Empact · commit 93de2891fa9c · 2018-07-13T12:41:45.000-04:00
According to my understanding, it should not be possible for coinbase
transactions to be conflicting, thus it should not be possible for
GetDepthInMainChain to return a negative result. If it did, this would
also result in innacurate results for GetBlocksToMaturity due to the
math therein. asserting ensures accuracy.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4397,7 +4397,9 @@ int CMerkleTx::GetBlocksToMaturity() const
 {
     if (!IsCoinBase())
         return 0;
-    return std::max(0, (COINBASE_MATURITY+1) - GetDepthInMainChain());
+    int chain_depth = GetDepthInMainChain();
+    assert(chain_depth >= 0); // coinbase tx should not be conflicted
+    return std::max(0, (COINBASE_MATURITY+1) - chain_depth);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -4397,7 +4397,9 @@ int CMerkleTx::GetBlocksToMaturity() const`
`4397`	`4397`	`{`
`4398`	`4398`	`if (!IsCoinBase())`
`4399`	`4399`	`return 0;`
`4400`		`- return std::max(0, (COINBASE_MATURITY+1) - GetDepthInMainChain());`
	`4400`	`+ int chain_depth = GetDepthInMainChain();`
	`4401`	`+ assert(chain_depth >= 0); // coinbase tx should not be conflicted`
	`4402`	`+ return std::max(0, (COINBASE_MATURITY+1) - chain_depth);`
`4401`	`4403`	`}`
`4402`	`4404`
`4403`	`4405`