Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: correct main_tests (subsidy) #19

Merged
merged 3 commits into from
Apr 12, 2021
Merged

test: correct main_tests (subsidy) #19

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0de9a4d
Included missing header file for boost (bind/placeholders)
SmartArray Apr 1, 2021
5747bb3
Fixed main_tests for supply curve
SmartArray Apr 2, 2021
1dde1ec
Introduced optimization and documented some code blocks
SmartArray Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 45 additions & 23 deletions src/test/main_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@
#define DEBUG(x,y) (void) (x)
#endif

#ifndef BLOCK_TIME_SECONDS
#define BLOCK_TIME_SECONDS 15
#endif

#ifndef SECONDS_PER_MONTH
#define SECONDS_PER_MONTH (60 * 60 * 24 * 365 / 12)
#endif

BOOST_FIXTURE_TEST_SUITE(main_tests, TestingSetup)

Expand Down Expand Up @@ -122,30 +129,44 @@ static void TestBlockSubsidy(const Consensus::Params& consensusParams, int nMaxB
DEBUG(nBlocks, nSubsidy);
}

// Updated dynamic mining rewards from block height 1,430,000 to max block height (41.6 million)
for (int nBlocks = consensusParams.workComputationChangeTarget; nBlocks < nMaxBlocks; ++nBlocks) {
int nHeight = nBlocks;
CAmount nSubsidy = GetBlockSubsidy(nHeight, consensusParams);

CAmount nExpectedSubsidy = 2157 * COIN / 2;
int nHeightWithinFork = (nHeight - consensusParams.workComputationChangeTarget);

int nMonths = nHeightWithinFork * BLOCK_TIME_SECONDS / SECONDS_PER_MONTH;
pow
SmartArray marked this conversation as resolved.
Show resolved Hide resolved
for (int i = 0; i < nMonths; ++i) {
// Decay factor: 98884/100000
nExpectedSubsidy *= 98884;
nExpectedSubsidy /= 100000;
}

if (nExpectedSubsidy < COIN) {
nExpectedSubsidy = COIN;
{
// Updated dynamic mining rewards from block height 1,430,000 to max block height.
// Intended blockheight: 41.6 million
// Actual blockheight: 110.5 million
CAmount nExpectedSubsidyStart = 2157 * COIN / 2;
CAmount nExpectedSubsidy = nExpectedSubsidyStart;
int nMonthsConsidered = 0;

for (int nBlocks = consensusParams.workComputationChangeTarget; nBlocks < nMaxBlocks; ++nBlocks) {
int nHeight = nBlocks;
CAmount nSubsidy = GetBlockSubsidy(nHeight, consensusParams);

int nHeightWithinFork = (nHeight - consensusParams.workComputationChangeTarget);
int nMonths = nHeightWithinFork * BLOCK_TIME_SECONDS / SECONDS_PER_MONTH;

if (nMonthsConsidered < nMonths) {
// Calculate new subsidy for number of months `nMonths`.
// This is a major optimization in order to reduce the
// number of inner loops

// Recalculate subsidy
for (int i = nMonthsConsidered; i < nMonths; ++i) {
// Decay factor: 98884/100000
nExpectedSubsidy *= 98884;
nExpectedSubsidy /= 100000;
++nMonthsConsidered;
}
}

if (nExpectedSubsidy < COIN) { // ToDo: Alter consensus
nExpectedSubsidy = COIN;
}

BOOST_CHECK_EQUAL(nSubsidy, nExpectedSubsidy);

nSum += nSubsidy;
DEBUG(nBlocks, nSubsidy);
}

BOOST_CHECK_EQUAL(nSubsidy, nExpectedSubsidy);

nSum += nSubsidy;
DEBUG(nBlocks, nSubsidy);
}

CAmount nSubsidy = GetBlockSubsidy(nMaxBlocks, consensusParams);
Expand All @@ -169,6 +190,7 @@ BOOST_AUTO_TEST_CASE(block_subsidy_test)
BOOST_CHECK_EQUAL(sum, nExpectedTotalSupply);

#if OUTPUT_SUPPLY_SAMPLES_ENABLED
// Output the accumulated supply until END_OF_SUPPLY_CURVE
std::cout << "(mainnet): MAXIMUM SUPPLY: " << sum << " dgbSATS (" << (sum / COIN) << " DGB)";
#else
// Only perform test on TESTNET too, if we are not
Expand Down