Skip to content

Commit

Permalink
Remove dead code.
Browse files Browse the repository at this point in the history
  • Loading branch information
evoskuil committed Feb 18, 2024
1 parent 36df431 commit 5fb2b61
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions src/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ settings::settings(chain::selection context) NOEXCEPT
bip66_freeze = 363725;
bip34_freeze = 227931;
bip16_activation_time = 0x4f779a80;
bip34_active_checkpoint =
{ "000000000000024b89b42a942fe0d9fea3bb44ab7bd1b19115dd6a759c0808b8", bip34_freeze };
////bip34_active_checkpoint =
//// { "000000000000024b89b42a942fe0d9fea3bb44ab7bd1b19115dd6a759c0808b8", bip34_freeze };
bip9_bit0_active_checkpoint =
{ "000000000000000004a1b34462cb8aeebd5799177f7a29cf28f2d1961716b5b5", 419328 };
bip9_bit1_active_checkpoint =
Expand Down Expand Up @@ -176,8 +176,8 @@ settings::settings(chain::selection context) NOEXCEPT
bip66_freeze = 330776;
bip34_freeze = 21111;
bip16_activation_time = 0x4f3af580;
bip34_active_checkpoint =
{ "0000000023b3a96d3484e5abb3755c413e7d41500f8e2a5c3f0dd01299cd8ef8", bip34_freeze };
////bip34_active_checkpoint =
//// { "0000000023b3a96d3484e5abb3755c413e7d41500f8e2a5c3f0dd01299cd8ef8", bip34_freeze };
bip9_bit0_active_checkpoint =
{ "00000000025e930139bac5c6c31a403776da130831ab85be56578f3fa75369bb", 770112 };
bip9_bit1_active_checkpoint =
Expand Down Expand Up @@ -236,8 +236,8 @@ settings::settings(chain::selection context) NOEXCEPT

// bip9's are fixed and closed, so assume genesis activation.
// bip90 assumes a historical bip34 activation block, so use genesis.
bip34_active_checkpoint =
{ "0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206", 0 };
////bip34_active_checkpoint =
//// { "0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206", 0 };
bip9_bit0_active_checkpoint =
{ "0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206", 0 };
bip9_bit1_active_checkpoint =
Expand Down
6 changes: 3 additions & 3 deletions test/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE(settings__construct__mainnet_context__expected)
BOOST_REQUIRE_EQUAL(configuration.bip34_freeze, 227931u);
BOOST_REQUIRE_EQUAL(configuration.bip16_activation_time, 1333238400u);
const chain::checkpoint bip34_active("000000000000024b89b42a942fe0d9fea3bb44ab7bd1b19115dd6a759c0808b8", configuration.bip34_freeze);
BOOST_REQUIRE_EQUAL(configuration.bip34_active_checkpoint, bip34_active);
////BOOST_REQUIRE_EQUAL(configuration.bip34_active_checkpoint, bip34_active);
const chain::checkpoint bit0_active("000000000000000004a1b34462cb8aeebd5799177f7a29cf28f2d1961716b5b5", 419328u);
BOOST_REQUIRE_EQUAL(configuration.bip9_bit0_active_checkpoint, bit0_active);
const chain::checkpoint bit1_active("0000000000000000001c8018d9cb3b742ef25114f27563e3fc4a1902167f9893", 481824u);
Expand Down Expand Up @@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE(settings__construct__testnet_context__expected)
BOOST_REQUIRE_EQUAL(configuration.bip34_freeze, 21111u);
BOOST_REQUIRE_EQUAL(configuration.bip16_activation_time, 1329264000u);
const chain::checkpoint bip34_active("0000000023b3a96d3484e5abb3755c413e7d41500f8e2a5c3f0dd01299cd8ef8", configuration.bip34_freeze);
BOOST_REQUIRE_EQUAL(configuration.bip34_active_checkpoint, bip34_active);
////BOOST_REQUIRE_EQUAL(configuration.bip34_active_checkpoint, bip34_active);
const chain::checkpoint bit0_active("00000000025e930139bac5c6c31a403776da130831ab85be56578f3fa75369bb", 770112u);
BOOST_REQUIRE_EQUAL(configuration.bip9_bit0_active_checkpoint, bit0_active);
const chain::checkpoint bit1_active("00000000002b980fcd729daaa248fd9316a5200e9b367f4ff2c42453e84201ca", 834624u);
Expand Down Expand Up @@ -143,7 +143,7 @@ BOOST_AUTO_TEST_CASE(settings__construct__regtest_context__expected)
BOOST_REQUIRE_EQUAL(configuration.bip34_freeze, 0u);
BOOST_REQUIRE_EQUAL(configuration.bip16_activation_time, 1329264000u);
const chain::checkpoint genesis(genesis_block.hash(), 0u);
BOOST_REQUIRE_EQUAL(configuration.bip34_active_checkpoint, genesis);
////BOOST_REQUIRE_EQUAL(configuration.bip34_active_checkpoint, genesis);
BOOST_REQUIRE_EQUAL(configuration.bip9_bit0_active_checkpoint, genesis);
BOOST_REQUIRE_EQUAL(configuration.bip9_bit1_active_checkpoint, genesis);
BOOST_REQUIRE_EQUAL(configuration.initial_subsidy_bitcoin, 50u);
Expand Down

0 comments on commit 5fb2b61

Please sign in to comment.