zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix failing tests

This commit is contained in:
Jack Grigg 2016-06-10 16:16:33 +12:00
parent d4388ed52b
commit 3fe29eab90
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/rpc-tests/zcpourdoublespend.py
View File

@ -41,8 +41,8 @@ class PourTxTest(BitcoinTestFramework):
assert_equal(self.cannot_pour(node, txn), True) assert_equal(self.cannot_pour(node, txn), True)
def run_test(self): def run_test(self):
# All nodes should start with 1,250 BTC: # All nodes should start with 250 BTC:
starting_balance = 1000 starting_balance = 250
for i in range(4): for i in range(4):
assert_equal(self.nodes[i].getbalance(), starting_balance) assert_equal(self.nodes[i].getbalance(), starting_balance)
self.nodes[i].getnewaddress("") # bug workaround, coins generated assigned to first getnewaddress! self.nodes[i].getnewaddress("") # bug workaround, coins generated assigned to first getnewaddress!

18
src/test/alert_tests.cpp
View File

@ -201,7 +201,7 @@ BOOST_AUTO_TEST_CASE(PartitionAlert)
{ {
// Test PartitionCheck // Test PartitionCheck
CCriticalSection csDummy; CCriticalSection csDummy;
CBlockIndex indexDummy[100]; CBlockIndex indexDummy[400];
CChainParams& params = Params(CBaseChainParams::MAIN); CChainParams& params = Params(CBaseChainParams::MAIN);
int64_t nPowTargetSpacing = params.GetConsensus().nPowTargetSpacing; int64_t nPowTargetSpacing = params.GetConsensus().nPowTargetSpacing;
@ -209,26 +209,26 @@ BOOST_AUTO_TEST_CASE(PartitionAlert)
// an arbitrary time: // an arbitrary time:
int64_t now = 1427379054; int64_t now = 1427379054;
SetMockTime(now); SetMockTime(now);
for (int i = 0; i < 100; i++) for (int i = 0; i < 400; i++)
{ {
indexDummy[i].phashBlock = NULL; indexDummy[i].phashBlock = NULL;
if (i == 0) indexDummy[i].pprev = NULL; if (i == 0) indexDummy[i].pprev = NULL;
else indexDummy[i].pprev = &indexDummy[i-1]; else indexDummy[i].pprev = &indexDummy[i-1];
indexDummy[i].nHeight = i; indexDummy[i].nHeight = i;
indexDummy[i].nTime = now - (100-i)*nPowTargetSpacing; indexDummy[i].nTime = now - (400-i)*nPowTargetSpacing;
// Other members don't matter, the partition check code doesn't // Other members don't matter, the partition check code doesn't
// use them // use them
} }
// Test 1: chain with blocks every nPowTargetSpacing seconds, // Test 1: chain with blocks every nPowTargetSpacing seconds,
// as normal, no worries: // as normal, no worries:
PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing); PartitionCheck(falseFunc, csDummy, &indexDummy[399], nPowTargetSpacing);
BOOST_CHECK(strMiscWarning.empty()); BOOST_CHECK(strMiscWarning.empty());
// Test 2: go 3.5 hours without a block, expect a warning: // Test 2: go 3.5 hours without a block, expect a warning:
now += 3*60*60+30*60; now += 3*60*60+30*60;
SetMockTime(now); SetMockTime(now);
PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing); PartitionCheck(falseFunc, csDummy, &indexDummy[399], nPowTargetSpacing);
BOOST_CHECK(!strMiscWarning.empty()); BOOST_CHECK(!strMiscWarning.empty());
BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning); BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning);
strMiscWarning = ""; strMiscWarning = "";
@ -237,16 +237,16 @@ BOOST_AUTO_TEST_CASE(PartitionAlert)
// code: // code:
now += 60*10; now += 60*10;
SetMockTime(now); SetMockTime(now);
PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing); PartitionCheck(falseFunc, csDummy, &indexDummy[399], nPowTargetSpacing);
BOOST_CHECK(strMiscWarning.empty()); BOOST_CHECK(strMiscWarning.empty());
// Test 4: get 2.5 times as many blocks as expected: // Test 4: get 2.5 times as many blocks as expected:
now += 60*60*24; // Pretend it is a day later now += 60*60*24; // Pretend it is a day later
SetMockTime(now); SetMockTime(now);
int64_t quickSpacing = nPowTargetSpacing*2/5; int64_t quickSpacing = nPowTargetSpacing*2/5;
for (int i = 0; i < 100; i++) // Tweak chain timestamps: for (int i = 0; i < 400; i++) // Tweak chain timestamps:
indexDummy[i].nTime = now - (100-i)*quickSpacing; indexDummy[i].nTime = now - (400-i)*quickSpacing;
PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing); PartitionCheck(falseFunc, csDummy, &indexDummy[399], nPowTargetSpacing);
BOOST_CHECK(!strMiscWarning.empty()); BOOST_CHECK(!strMiscWarning.empty());
BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning); BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning);
strMiscWarning = ""; strMiscWarning = "";