Merge pull request #116 from DigiByte-Core/fix/tests-subsidy

gto90 · web-flow · commit 67f81d7347b7 · 2023-04-01T11:14:51.000-05:00
Fix tests related to subsidy
diff --git a/src/test/validation_tests.cpp b/src/test/validation_tests.cpp
@@ -174,7 +174,7 @@ static void TestBlockSubsidy(const Consensus::Params& consensusParams, int nMaxB
     }
 
     CAmount nSubsidy = GetBlockSubsidy(nMaxBlocks, consensusParams);
-    CAmount nExpectedSubsidy = 1 * COIN;
+    CAmount nExpectedSubsidy = 0 * COIN;
 
     BOOST_CHECK_EQUAL(nSubsidy, nExpectedSubsidy);
 
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1201,7 +1201,6 @@ CTransactionRef GetTransaction(const CBlockIndex* const block_index, const CTxMe
 CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
 {
     CAmount nSubsidy = COIN;
-    LogPrintf("block height for reward is %d\n", nHeight);
 
     if (nHeight < consensusParams.nDiffChangeTarget) { // < 67200
         if (nHeight < 1440)

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ static void TestBlockSubsidy(const Consensus::Params& consensusParams, int nMaxB`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`CAmount nSubsidy = GetBlockSubsidy(nMaxBlocks, consensusParams);`
`177`		`- CAmount nExpectedSubsidy = 1 * COIN;`
	`177`	`+ CAmount nExpectedSubsidy = 0 * COIN;`
`178`	`178`
`179`	`179`	`BOOST_CHECK_EQUAL(nSubsidy, nExpectedSubsidy);`
`180`	`180`
Original file line number	Diff line number	Diff line change
`@@ -1201,7 +1201,6 @@ CTransactionRef GetTransaction(const CBlockIndex* const block_index, const CTxMe`
`1201`	`1201`	`CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)`
`1202`	`1202`	`{`
`1203`	`1203`	`CAmount nSubsidy = COIN;`
`1204`		`- LogPrintf("block height for reward is %d\n", nHeight);`
`1205`	`1204`
`1206`	`1205`	`if (nHeight < consensusParams.nDiffChangeTarget) { // < 67200`
`1207`	`1206`	`if (nHeight < 1440)`