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

Auto merge of #3157 - bitcartel:2966_extend_sprout_tests_part_2, r=str4d 

Part of #2966, extending Sprout tests to other epochs

This continues the work started in PR #3109.
This commit is contained in:
Homu 2018-04-14 16:36:30 -07:00
parent ceb4559eac 61624ed05d
commit 1594c845f5
5 changed files with 66 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtest/test_validation.cpp
View File

@ -71,10 +71,12 @@ TEST(Validation, ContextualCheckInputsPassesWithCoinbase) {
FakeCoinsViewDB fakeDB; FakeCoinsViewDB fakeDB;
CCoinsViewCache view(&fakeDB); CCoinsViewCache view(&fakeDB);
auto consensusBranchId = SPROUT_BRANCH_ID; for (int idx = Consensus::BASE_SPROUT; idx < Consensus::MAX_NETWORK_UPGRADES; idx++) {
CValidationState state; auto consensusBranchId = NetworkUpgradeInfo[idx].nBranchId;
PrecomputedTransactionData txdata(tx); CValidationState state;
EXPECT_TRUE(ContextualCheckInputs(tx, state, view, false, 0, false, txdata, Params(CBaseChainParams::MAIN).GetConsensus(), consensusBranchId)); PrecomputedTransactionData txdata(tx);
EXPECT_TRUE(ContextualCheckInputs(tx, state, view, false, 0, false, txdata, Params(CBaseChainParams::MAIN).GetConsensus(), consensusBranchId));
}
} }
TEST(Validation, ReceivedBlockTransactions) { TEST(Validation, ReceivedBlockTransactions) {

6
src/test/DoS_tests.cpp
View File

@ -25,6 +25,7 @@
#include <boost/date_time/posix_time/posix_time_types.hpp> #include <boost/date_time/posix_time/posix_time_types.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/test/data/test_case.hpp>
// Tests this internal-to-main.cpp method: // Tests this internal-to-main.cpp method:
extern bool AddOrphanTx(const CTransaction& tx, NodeId peer); extern bool AddOrphanTx(const CTransaction& tx, NodeId peer);
@ -118,9 +119,10 @@ CTransaction RandomOrphan()
return it->second.tx; return it->second.tx;
} }
BOOST_AUTO_TEST_CASE(DoS_mapOrphans) // Parameterized testing over consensus branch ids
BOOST_DATA_TEST_CASE(DoS_mapOrphans, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
uint32_t consensusBranchId = SPROUT_BRANCH_ID; uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
CKey key; CKey key;
key.MakeNewKey(true); key.MakeNewKey(true);

11
src/test/multisig_tests.cpp
View File

@ -19,6 +19,7 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/test/data/test_case.hpp>
using namespace std; using namespace std;
@ -43,9 +44,10 @@ sign_multisig(CScript scriptPubKey, vector<CKey> keys, CTransaction transaction,
return result; return result;
} }
BOOST_AUTO_TEST_CASE(multisig_verify) // Parameterized testing over consensus branch ids
BOOST_DATA_TEST_CASE(multisig_verify, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
uint32_t consensusBranchId = SPROUT_BRANCH_ID; uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
unsigned int flags = SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC; unsigned int flags = SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC;
ScriptError err; ScriptError err;
@ -277,9 +279,10 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1)
} }
} }
BOOST_AUTO_TEST_CASE(multisig_Sign) // Parameterized testing over consensus branch ids
BOOST_DATA_TEST_CASE(multisig_Sign, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
uint32_t consensusBranchId = SPROUT_BRANCH_ID; uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
// Test SignSignature() (and therefore the version of Solver() that signs transactions) // Test SignSignature() (and therefore the version of Solver() that signs transactions)
CBasicKeyStore keystore; CBasicKeyStore keystore;

38
src/test/script_P2SH_tests.cpp
View File

@ -19,6 +19,7 @@
#include <vector> #include <vector>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/test/data/test_case.hpp>
using namespace std; using namespace std;
@ -31,10 +32,8 @@ Serialize(const CScript& s)
} }
static bool static bool
Verify(const CScript& scriptSig, const CScript& scriptPubKey, bool fStrict, ScriptError& err) Verify(const CScript& scriptSig, const CScript& scriptPubKey, bool fStrict, ScriptError& err, uint32_t consensusBranchId)
{ {
uint32_t consensusBranchId = SPROUT_BRANCH_ID;
// Create dummy to/from transactions: // Create dummy to/from transactions:
CMutableTransaction txFrom; CMutableTransaction txFrom;
txFrom.vout.resize(1); txFrom.vout.resize(1);
@ -54,10 +53,11 @@ Verify(const CScript& scriptSig, const CScript& scriptPubKey, bool fStrict, Scri
BOOST_FIXTURE_TEST_SUITE(script_P2SH_tests, BasicTestingSetup) BOOST_FIXTURE_TEST_SUITE(script_P2SH_tests, BasicTestingSetup)
BOOST_AUTO_TEST_CASE(sign) // Parameterized testing over consensus branch ids
BOOST_DATA_TEST_CASE(sign, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
LOCK(cs_main); LOCK(cs_main);
uint32_t consensusBranchId = SPROUT_BRANCH_ID; uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
// Pay-to-script-hash looks like this: // Pay-to-script-hash looks like this:
// scriptSig: <sig> <sig...> <serialized_script> // scriptSig: <sig> <sig...> <serialized_script>
// scriptPubKey: HASH160 <hash> EQUAL // scriptPubKey: HASH160 <hash> EQUAL
@ -131,8 +131,11 @@ BOOST_AUTO_TEST_CASE(sign)
} }
} }
BOOST_AUTO_TEST_CASE(norecurse) // Parameterized testing over consensus branch ids
BOOST_DATA_TEST_CASE(norecurse, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
ScriptError err; ScriptError err;
// Make sure only the outer pay-to-script-hash does the // Make sure only the outer pay-to-script-hash does the
// extra-validation thing: // extra-validation thing:
@ -145,7 +148,7 @@ BOOST_AUTO_TEST_CASE(norecurse)
scriptSig << Serialize(invalidAsScript); scriptSig << Serialize(invalidAsScript);
// Should not verify, because it will try to execute OP_INVALIDOPCODE // Should not verify, because it will try to execute OP_INVALIDOPCODE
BOOST_CHECK(!Verify(scriptSig, p2sh, true, err)); BOOST_CHECK(!Verify(scriptSig, p2sh, true, err, consensusBranchId));
BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_BAD_OPCODE, ScriptErrorString(err)); BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_BAD_OPCODE, ScriptErrorString(err));
// Try to recur, and verification should succeed because // Try to recur, and verification should succeed because
@ -154,14 +157,15 @@ BOOST_AUTO_TEST_CASE(norecurse)
CScript scriptSig2; CScript scriptSig2;
scriptSig2 << Serialize(invalidAsScript) << Serialize(p2sh); scriptSig2 << Serialize(invalidAsScript) << Serialize(p2sh);
BOOST_CHECK(Verify(scriptSig2, p2sh2, true, err)); BOOST_CHECK(Verify(scriptSig2, p2sh2, true, err, consensusBranchId));
BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err)); BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
} }
BOOST_AUTO_TEST_CASE(set) // Parameterized testing over consensus branch ids
BOOST_DATA_TEST_CASE(set, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
LOCK(cs_main); LOCK(cs_main);
uint32_t consensusBranchId = SPROUT_BRANCH_ID; uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
// Test the CScript::Set* methods // Test the CScript::Set* methods
CBasicKeyStore keystore; CBasicKeyStore keystore;
CKey key[4]; CKey key[4];
@ -247,8 +251,11 @@ BOOST_AUTO_TEST_CASE(is)
BOOST_CHECK(!not_p2sh.IsPayToScriptHash()); BOOST_CHECK(!not_p2sh.IsPayToScriptHash());
} }
BOOST_AUTO_TEST_CASE(switchover) // Parameterized testing over consensus branch ids
BOOST_DATA_TEST_CASE(switchover, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
// Test switch over code // Test switch over code
CScript notValid; CScript notValid;
ScriptError err; ScriptError err;
@ -260,17 +267,18 @@ BOOST_AUTO_TEST_CASE(switchover)
// Validation should succeed under old rules (hash is correct): // Validation should succeed under old rules (hash is correct):
BOOST_CHECK(Verify(scriptSig, fund, false, err)); BOOST_CHECK(Verify(scriptSig, fund, false, err, consensusBranchId));
BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err)); BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
// Fail under new: // Fail under new:
BOOST_CHECK(!Verify(scriptSig, fund, true, err)); BOOST_CHECK(!Verify(scriptSig, fund, true, err, consensusBranchId));
BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EQUALVERIFY, ScriptErrorString(err)); BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EQUALVERIFY, ScriptErrorString(err));
} }
BOOST_AUTO_TEST_CASE(AreInputsStandard) // Parameterized testing over consensus branch ids
BOOST_DATA_TEST_CASE(AreInputsStandard, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
LOCK(cs_main); LOCK(cs_main);
uint32_t consensusBranchId = SPROUT_BRANCH_ID; uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
CCoinsView coinsDummy; CCoinsView coinsDummy;
CCoinsViewCache coins(&coinsDummy); CCoinsViewCache coins(&coinsDummy);
CBasicKeyStore keystore; CBasicKeyStore keystore;

40
src/test/script_tests.cpp
View File

@ -27,6 +27,7 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/test/data/test_case.hpp>
#include <univalue.h> #include <univalue.h>
@ -577,9 +578,12 @@ BOOST_AUTO_TEST_CASE(script_build)
#endif #endif
} }
BOOST_AUTO_TEST_CASE(script_valid) // Parameterized testing over consensus branch ids
// Note: In the future, we could have different test data files based on epoch.
BOOST_DATA_TEST_CASE(script_valid, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
uint32_t consensusBranchId = SPROUT_BRANCH_ID; uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
// Read tests from test/data/script_valid.json // Read tests from test/data/script_valid.json
// Format is an array of arrays // Format is an array of arrays
// Inner arrays are [ "scriptSig", "scriptPubKey", "flags" ] // Inner arrays are [ "scriptSig", "scriptPubKey", "flags" ]
@ -607,9 +611,12 @@ BOOST_AUTO_TEST_CASE(script_valid)
} }
} }
BOOST_AUTO_TEST_CASE(script_invalid) // Parameterized testing over consensus branch ids
// Note: In the future, we could have different test data files based on epoch.
BOOST_DATA_TEST_CASE(script_invalid, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
uint32_t consensusBranchId = SPROUT_BRANCH_ID; uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
// Scripts that should evaluate as invalid // Scripts that should evaluate as invalid
UniValue tests = read_json(std::string(json_tests::script_invalid, json_tests::script_invalid + sizeof(json_tests::script_invalid))); UniValue tests = read_json(std::string(json_tests::script_invalid, json_tests::script_invalid + sizeof(json_tests::script_invalid)));
@ -633,9 +640,10 @@ BOOST_AUTO_TEST_CASE(script_invalid)
} }
} }
BOOST_AUTO_TEST_CASE(script_PushData) // Parameterized testing over consensus branch ids
BOOST_DATA_TEST_CASE(script_PushData, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
uint32_t consensusBranchId = SPROUT_BRANCH_ID; uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
// Check that PUSHDATA1, PUSHDATA2, and PUSHDATA4 create the same value on // Check that PUSHDATA1, PUSHDATA2, and PUSHDATA4 create the same value on
// the stack as the 1-75 opcodes do. // the stack as the 1-75 opcodes do.
@ -697,9 +705,10 @@ sign_multisig(CScript scriptPubKey, const CKey &key, CTransaction transaction, u
return sign_multisig(scriptPubKey, keys, transaction, consensusBranchId); return sign_multisig(scriptPubKey, keys, transaction, consensusBranchId);
} }
BOOST_AUTO_TEST_CASE(script_CHECKMULTISIG12) // Parameterized testing over consensus branch ids
BOOST_DATA_TEST_CASE(script_CHECKMULTISIG12, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
uint32_t consensusBranchId = SPROUT_BRANCH_ID; uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
ScriptError err; ScriptError err;
CKey key1, key2, key3; CKey key1, key2, key3;
@ -729,9 +738,10 @@ BOOST_AUTO_TEST_CASE(script_CHECKMULTISIG12)
BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err)); BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
} }
BOOST_AUTO_TEST_CASE(script_CHECKMULTISIG23) // Parameterized testing over consensus branch ids
BOOST_DATA_TEST_CASE(script_CHECKMULTISIG23, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
uint32_t consensusBranchId = SPROUT_BRANCH_ID; uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
ScriptError err; ScriptError err;
CKey key1, key2, key3, key4; CKey key1, key2, key3, key4;
@ -800,9 +810,10 @@ BOOST_AUTO_TEST_CASE(script_CHECKMULTISIG23)
BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_INVALID_STACK_OPERATION, ScriptErrorString(err)); BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_INVALID_STACK_OPERATION, ScriptErrorString(err));
} }
BOOST_AUTO_TEST_CASE(script_combineSigs) // Parameterized testing over consensus branch ids
BOOST_DATA_TEST_CASE(script_combineSigs, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
uint32_t consensusBranchId = SPROUT_BRANCH_ID; uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
// Test the CombineSignatures function // Test the CombineSignatures function
CAmount amount = 0; CAmount amount = 0;
@ -912,9 +923,10 @@ BOOST_AUTO_TEST_CASE(script_combineSigs)
BOOST_CHECK(combined.scriptSig == partial3c); BOOST_CHECK(combined.scriptSig == partial3c);
} }
BOOST_AUTO_TEST_CASE(script_standard_push) // Parameterized testing over consensus branch ids
BOOST_DATA_TEST_CASE(script_standard_push, boost::unit_test::data::xrange(static_cast<int>(Consensus::MAX_NETWORK_UPGRADES)))
{ {
uint32_t consensusBranchId = SPROUT_BRANCH_ID; uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
ScriptError err; ScriptError err;
for (int i=0; i<67000; i++) { for (int i=0; i<67000; i++) {