BTCPrivate
/
BitcoinPrivate-legacy
mirror of https://github.com/BTCPrivate/BitcoinPrivate-legacy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Founders reward: Refactor test and formatting per review.

This commit is contained in:
Simon 2016-09-23 14:16:38 -07:00
parent 3b30d8361a
commit 241867b115
2 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/chainparams.cpp
View File

@ -341,8 +341,7 @@ bool SelectParamsFromCommandLine()
// Block height must be >0 and <=last founders reward block height // Block height must be >0 and <=last founders reward block height
// Index variable i ranges from 0 - (vFoundersRewardAddress.size()-1) // Index variable i ranges from 0 - (vFoundersRewardAddress.size()-1)
std::string CChainParams::GetFoundersRewardAddressAtHeight(int nHeight) const std::string CChainParams::GetFoundersRewardAddressAtHeight(int nHeight) const {
{
int maxHeight = consensus.GetLastFoundersRewardBlockHeight(); int maxHeight = consensus.GetLastFoundersRewardBlockHeight();
assert(nHeight > 0 && nHeight <= maxHeight); assert(nHeight > 0 && nHeight <= maxHeight);
@ -353,8 +352,7 @@ std::string CChainParams::GetFoundersRewardAddressAtHeight(int nHeight) const
// Block height must be >0 and <=last founders reward block height // Block height must be >0 and <=last founders reward block height
// The founders reward address is expected to be a multisig (P2SH) address // The founders reward address is expected to be a multisig (P2SH) address
CScript CChainParams::GetFoundersRewardScriptAtHeight(int nHeight) const CScript CChainParams::GetFoundersRewardScriptAtHeight(int nHeight) const {
{
assert(nHeight > 0 && nHeight <= consensus.GetLastFoundersRewardBlockHeight()); assert(nHeight > 0 && nHeight <= consensus.GetLastFoundersRewardBlockHeight());
CBitcoinAddress address(GetFoundersRewardAddressAtHeight(nHeight).c_str()); CBitcoinAddress address(GetFoundersRewardAddressAtHeight(nHeight).c_str());

19
src/gtest/test_foundersreward.cpp
View File

@ -70,7 +70,8 @@ TEST(founders_reward_test, create_testnet_2of3multisig) {
// Utility method to check the number of unique addresses from height 1 to maxHeight // Utility method to check the number of unique addresses from height 1 to maxHeight
void checkNumberOfUniqueAddresses(int maxHeight, int nUnique) { void checkNumberOfUniqueAddresses(int nUnique) {
int maxHeight = Params().GetConsensus().GetLastFoundersRewardBlockHeight();
std::set<std::string> addresses; std::set<std::string> addresses;
for (int i = 1; i <= maxHeight; i++) { for (int i = 1; i <= maxHeight; i++) {
addresses.insert(Params().GetFoundersRewardAddressAtHeight(i)); addresses.insert(Params().GetFoundersRewardAddressAtHeight(i));
@ -104,10 +105,7 @@ TEST(founders_reward_test, general) {
TEST(founders_reward_test, mainnet) { TEST(founders_reward_test, mainnet) {
SelectParams(CBaseChainParams::MAIN); SelectParams(CBaseChainParams::MAIN);
CChainParams params = Params(); checkNumberOfUniqueAddresses(NUM_MAINNET_FOUNDER_ADDRESSES);
int maxHeight = params.GetConsensus().GetLastFoundersRewardBlockHeight();
checkNumberOfUniqueAddresses(maxHeight, NUM_MAINNET_FOUNDER_ADDRESSES);
} }
@ -115,10 +113,7 @@ TEST(founders_reward_test, mainnet) {
TEST(founders_reward_test, testnet) { TEST(founders_reward_test, testnet) {
SelectParams(CBaseChainParams::TESTNET); SelectParams(CBaseChainParams::TESTNET);
CChainParams params = Params(); checkNumberOfUniqueAddresses(NUM_TESTNET_FOUNDER_ADDRESSES);
int maxHeight = params.GetConsensus().GetLastFoundersRewardBlockHeight();
checkNumberOfUniqueAddresses(maxHeight, NUM_TESTNET_FOUNDER_ADDRESSES);
} }
@ -126,10 +121,7 @@ TEST(founders_reward_test, testnet) {
TEST(founders_reward_test, regtest) { TEST(founders_reward_test, regtest) {
SelectParams(CBaseChainParams::REGTEST); SelectParams(CBaseChainParams::REGTEST);
CChainParams params = Params(); checkNumberOfUniqueAddresses(NUM_REGTEST_FOUNDER_ADDRESSES);
int maxHeight = params.GetConsensus().GetLastFoundersRewardBlockHeight();
checkNumberOfUniqueAddresses(maxHeight, NUM_REGTEST_FOUNDER_ADDRESSES);
} }
@ -167,6 +159,5 @@ TEST(founders_reward_test, per_address_reward) {
ASSERT_TRUE(ms.count(params.GetFoundersRewardAddressAtIndex(i)) == 17709); ASSERT_TRUE(ms.count(params.GetFoundersRewardAddressAtIndex(i)) == 17709);
} }
ASSERT_TRUE(ms.count(params.GetFoundersRewardAddressAtIndex(47)) == 17677); ASSERT_TRUE(ms.count(params.GetFoundersRewardAddressAtIndex(47)) == 17677);
} }