diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-03-11 15:06:58 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-03-11 15:13:05 +0100 |
| commit | e564e63ef04e55b1e446f8440d51c611bc41cec6 (patch) | |
| tree | 2d82b4c9e378cffcd0fb23c75126086df4d07503 /src/test | |
| parent | d734d87b28ccbf2a4a4eb19a28285b5dea782105 (diff) | |
| parent | 3aa0130b963087025b64108225bbadea36d8c6df (diff) | |
Merge pull request #5871
3aa0130 test: remove fSkipProofOfWork (Wladimir J. van der Laan)
59bd89f test: Remove UNITTEST params (Wladimir J. van der Laan)
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/base58_tests.cpp | 4 | ||||
| -rw-r--r-- | src/test/test_bitcoin.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp index e7d0281881..c242dd26e2 100644 --- a/src/test/base58_tests.cpp +++ b/src/test/base58_tests.cpp @@ -127,6 +127,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_parse) std::vector<unsigned char> result; CBitcoinSecret secret; CBitcoinAddress addr; + SelectParams(CBaseChainParams::MAIN); BOOST_FOREACH(Value& tv, tests) { @@ -176,7 +177,6 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_parse) BOOST_CHECK_MESSAGE(!secret.IsValid(), "IsValid pubkey as privkey:" + strTest); } } - SelectParams(CBaseChainParams::UNITTEST); } // Goal: check that generated keys match test vectors @@ -244,7 +244,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_gen) CTxDestination nodest = CNoDestination(); BOOST_CHECK(!dummyAddr.Set(nodest)); - SelectParams(CBaseChainParams::UNITTEST); + SelectParams(CBaseChainParams::MAIN); } // Goal: check that base58 parsing code is robust against a variety of corrupted data diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index 5df417b8e5..a1355ad445 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -29,7 +29,7 @@ extern void noui_connect(); TestingSetup::TestingSetup() { fPrintToDebugLog = false; // don't want to write to debug.log file - SelectParams(CBaseChainParams::UNITTEST); + SelectParams(CBaseChainParams::MAIN); noui_connect(); #ifdef ENABLE_WALLET bitdb.MakeMock(); |