From 56d42a9d90eb43bd319600638616ca317eb85423 Mon Sep 17 00:00:00 2001 From: Sam Garrett Date: Sat, 1 Feb 2014 13:03:43 -0500 Subject: [PATCH] test - fixed tests that were failing because of bit/litecoin cruft --- src/test/Checkpoints_tests.cpp | 18 +++++++++--------- src/test/DoS_tests.cpp | 9 +++------ src/test/key_tests.cpp | 18 +++++++++--------- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/test/Checkpoints_tests.cpp b/src/test/Checkpoints_tests.cpp index 36a987391..4c7c1acde 100644 --- a/src/test/Checkpoints_tests.cpp +++ b/src/test/Checkpoints_tests.cpp @@ -14,21 +14,21 @@ BOOST_AUTO_TEST_SUITE(Checkpoints_tests) BOOST_AUTO_TEST_CASE(sanity) { - uint256 p1500 = uint256("0x841a2965955dd288cfa707a755d05a54e45f8bd476835ec9af4402a2b59a2967"); - uint256 p120000 = uint256("0xbd9d26924f05f6daa7f0155f32828ec89e8e29cee9e7121b026a7a3552ac6131"); - BOOST_CHECK(Checkpoints::CheckBlock(1500, p1500)); - BOOST_CHECK(Checkpoints::CheckBlock(120000, p120000)); + uint256 p42279 = uint256("0x8444c3ef39a46222e87584ef956ad2c9ef401578bd8b51e8e4b9a86ec3134d3a"); + uint256 p42400 = uint256("0x557bb7c17ed9e6d4a6f9361cfddf7c1fc0bdc394af7019167442b41f507252b4"); + BOOST_CHECK(Checkpoints::CheckBlock(42279, p42279)); + BOOST_CHECK(Checkpoints::CheckBlock(42400, p42400)); // Wrong hashes at checkpoints should fail: - BOOST_CHECK(!Checkpoints::CheckBlock(1500, p120000)); - BOOST_CHECK(!Checkpoints::CheckBlock(120000, p1500)); + BOOST_CHECK(!Checkpoints::CheckBlock(42279, p42400)); + BOOST_CHECK(!Checkpoints::CheckBlock(42400, p42279)); // ... but any hash not at a checkpoint should succeed: - BOOST_CHECK(Checkpoints::CheckBlock(1500+1, p120000)); - BOOST_CHECK(Checkpoints::CheckBlock(120000+1, p1500)); + BOOST_CHECK(Checkpoints::CheckBlock(42279+1, p42400)); + BOOST_CHECK(Checkpoints::CheckBlock(42400+1, p42279)); - BOOST_CHECK(Checkpoints::GetTotalBlocksEstimate() >= 120000); + BOOST_CHECK(Checkpoints::GetTotalBlocksEstimate() >= 42400); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index 2ee64755d..918f549b2 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -99,14 +99,11 @@ BOOST_AUTO_TEST_CASE(DoS_checknbits) { using namespace boost::assign; // for 'map_list_of()' - // Timestamps,nBits from the bitcoin block chain. + // Timestamps,and difficulty from the bitcoin blockchain. // These are the block-chain checkpoint blocks typedef std::map BlockData; BlockData chainData = - map_list_of(1239852051,486604799)(1262749024,486594666) - (1279305360,469854461)(1280200847,469830746)(1281678674,469809688) - (1296207707,453179945)(1302624061,453036989)(1309640330,437004818) - (1313172719,436789733); + map_list_of(1386481098,486789243)(1388890893,469814416); // Make sure CheckNBits considers every combination of block-chain-lock-in-points // "sane": @@ -125,7 +122,7 @@ BOOST_AUTO_TEST_CASE(DoS_checknbits) // First checkpoint difficulty at or a while after the last checkpoint time should fail when // compared to last checkpoint BOOST_CHECK(!CheckNBits(firstcheck.second, lastcheck.first+60*10, lastcheck.second, lastcheck.first)); - BOOST_CHECK(!CheckNBits(firstcheck.second, lastcheck.first+60*60*24*14, lastcheck.second, lastcheck.first)); + BOOST_CHECK(!CheckNBits(firstcheck.second, lastcheck.first+60*60*24*4, lastcheck.second, lastcheck.first)); // ... but OK if enough time passed for difficulty to adjust downward: BOOST_CHECK(CheckNBits(firstcheck.second, lastcheck.first+60*60*24*365*4, lastcheck.second, lastcheck.first)); diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp index f94f915cc..7ef66dadf 100644 --- a/src/test/key_tests.cpp +++ b/src/test/key_tests.cpp @@ -10,17 +10,17 @@ using namespace std; -static const string strSecret1 ("6uu5bsZLA2Lm6yCxgwxDxHyZmhYeqBMLQT83Fyq738YhYucQPQf"); -static const string strSecret2 ("6vZDRwYgTNidWzmKs9x8QzQGeWCqbdUtNRpEKZMaP67ZSn8XMjb"); -static const string strSecret1C ("T6UsJv9hYpvDfM5noKYkB3vfeHxhyegkeWJ4y7qKeQJuyXMK11XX"); -static const string strSecret2C ("T9PBs5kq9QrkBPxeGNWKitMi4XuFVr25jaXTnuopLVZxCUAJbixA"); -static const CBitcoinAddress addr1 ("LWaFezDtucfCA4xcVEfs3R3xfgGWjSwcZr"); -static const CBitcoinAddress addr2 ("LXwHM6mRd432EzLJYwuKQMPhTzrgr7ur9K"); -static const CBitcoinAddress addr1C("LZWK8h7C166niP6GmpUmiGrvn4oxPqQgFV"); -static const CBitcoinAddress addr2C("Lgb6tdqmdW3n5E12johSuEAqRMt4kAr7yu"); +static const string strSecret1 ("6JFPe8b4jbpup7petSB98M8tcaqXCigji8fGrC8bEbbDQxQkQ68"); +static const string strSecret2 ("6KLE6U3w8x3rM7nA1ZQxR4KnyEzeirPEt4YaXWdY4roF7Tt96rq"); +static const string strSecret1C ("QP8WvtVMV2iU6y7LE27ksRspp4MAJizPWYovx88W71g1nfSdAhkV"); +static const string strSecret2C ("QTuro8Pwx5yaonvJmU4jbBfwuEmTViyAGNeNyfnG82o7HWJmnrLj"); +static const CBitcoinAddress addr1 ("DSpgzjPyfQB6ZzeSbMWpaZiTTxGf2oBCs4"); +static const CBitcoinAddress addr2 ("DR9VqfbWgEHZhNst34KQnABQXpPWXeLAJD"); +static const CBitcoinAddress addr1C("D8jZ6R8uuyQwiybupiVs3eDCedKdZ5bYV3"); +static const CBitcoinAddress addr2C("DP7rGcDbpAvMb1dKup981zNt1heWUuVLP7"); -static const string strAddressBad("LRjyUS2uuieEPkhZNdQz8hE5YycxVEqSXA"); +static const string strAddressBad ("DRjyUS2uuieEPkhZNdQz8hE5YycxVEqSXA"); #ifdef KEY_TESTS_DUMPINFO