DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Refactor ContextualCheckBlock tests

Browse Source 
Combines some of the needlessly separate tests. Each formerly separate
test is tagged with a SCOPED_TRACE to make sure logs are still useful.
This commit is contained in:
George Tankersley
2018-05-29 00:00:00 +00:00
committed by Jack Grigg
parent ec7466b62f
commit e601446adc
1 changed files with 10 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/gtest/test_checkblock.cpp
View File

@@ -234,15 +234,15 @@ TEST_F(ContextualCheckBlockTest, BlockSaplingRulesAcceptSaplingTx) {
ExpectValidBlockFromTx(CTransaction(mtx)); ExpectValidBlockFromTx(CTransaction(mtx));
} }
// TEST PLAN: next, check that each ruleset will not accept other transaction types. // TEST PLAN: next, check that each ruleset will not accept other transaction
// Currently (May 2018) this means we'll test Sprout-Overwinter, // types. Currently (May 2018) this means we'll test Sprout-Overwinter,
// Sprout-Sapling, Overwinter-Sprout, Overwinter-Sapling, Sapling-Sprout, and // Sprout-Sapling, Overwinter-Sprout, Overwinter-Sapling, Sapling-Sprout, and
// Sapling-Overwinter. // Sapling-Overwinter.
// Test that a block evaluated under Sprout rules cannot contain Overwinter // Test that a block evaluated under Sprout rules cannot contain non-Sprout
// transactions. This test assumes that mainnet Overwinter activation is at // transactions. This test assumes that mainnet Overwinter activation is at
// least height 2. // least height 2.
TEST_F(ContextualCheckBlockTest, BlockSproutRulesRejectOverwinterTx) { TEST_F(ContextualCheckBlockTest, BlockSproutRulesRejectOtherTx) {
CMutableTransaction mtx = GetFirstBlockTransaction(); CMutableTransaction mtx = GetFirstBlockTransaction();
// Make it an Overwinter transaction // Make it an Overwinter transaction
@@ -252,14 +252,6 @@ TEST_F(ContextualCheckBlockTest, BlockSproutRulesRejectOverwinterTx) {
SCOPED_TRACE("BlockSproutRulesRejectOverwinterTx"); SCOPED_TRACE("BlockSproutRulesRejectOverwinterTx");
ExpectInvalidBlockFromTx(CTransaction(mtx), 0, "tx-overwinter-not-active"); ExpectInvalidBlockFromTx(CTransaction(mtx), 0, "tx-overwinter-not-active");
};
// Test that a block evaluated under Sprout rules cannot contain Sapling
// transactions. This test assumes that mainnet Overwinter activation is at
// least height 2.
TEST_F(ContextualCheckBlockTest, BlockSproutRulesRejectSaplingTx) {
CMutableTransaction mtx = GetFirstBlockTransaction();
// Make it a Sapling transaction // Make it a Sapling transaction
mtx.fOverwintered = true; mtx.fOverwintered = true;
@@ -268,11 +260,12 @@ TEST_F(ContextualCheckBlockTest, BlockSproutRulesRejectSaplingTx) {
SCOPED_TRACE("BlockSproutRulesRejectSaplingTx"); SCOPED_TRACE("BlockSproutRulesRejectSaplingTx");
ExpectInvalidBlockFromTx(CTransaction(mtx), 0, "tx-overwinter-not-active"); ExpectInvalidBlockFromTx(CTransaction(mtx), 0, "tx-overwinter-not-active");
} };
// Test block evaluated under Overwinter rules will reject Sprout transactions // Test block evaluated under Overwinter rules cannot contain non-Overwinter
TEST_F(ContextualCheckBlockTest, BlockOverwinterRulesRejectSproutTx) { // transactions.
TEST_F(ContextualCheckBlockTest, BlockOverwinterRulesRejectOtherTx) {
SelectParams(CBaseChainParams::REGTEST); SelectParams(CBaseChainParams::REGTEST);
UpdateNetworkUpgradeParameters(Consensus::UPGRADE_OVERWINTER, 1); UpdateNetworkUpgradeParameters(Consensus::UPGRADE_OVERWINTER, 1);
@@ -283,15 +276,6 @@ TEST_F(ContextualCheckBlockTest, BlockOverwinterRulesRejectSproutTx) {
SCOPED_TRACE("BlockOverwinterRulesRejectSproutTx"); SCOPED_TRACE("BlockOverwinterRulesRejectSproutTx");
ExpectInvalidBlockFromTx(CTransaction(mtx), 100, "tx-overwinter-active"); ExpectInvalidBlockFromTx(CTransaction(mtx), 100, "tx-overwinter-active");
}
// Test that a block evaluated under Overwinter rules cannot contain Sapling transactions.
TEST_F(ContextualCheckBlockTest, BlockOverwinterRulesRejectSaplingTx) {
SelectParams(CBaseChainParams::REGTEST);
UpdateNetworkUpgradeParameters(Consensus::UPGRADE_OVERWINTER, 1);
CMutableTransaction mtx = GetFirstBlockTransaction();
// Make it a Sapling transaction // Make it a Sapling transaction
mtx.fOverwintered = true; mtx.fOverwintered = true;
@@ -303,8 +287,8 @@ TEST_F(ContextualCheckBlockTest, BlockOverwinterRulesRejectSaplingTx) {
} }
// Test block evaluated under Sapling rules cannot contain Sprout transactions // Test block evaluated under Sapling rules cannot contain non-Sapling transactions.
TEST_F(ContextualCheckBlockTest, BlockSaplingRulesRejectSproutTx) { TEST_F(ContextualCheckBlockTest, BlockSaplingRulesRejectOtherTx) {
SelectParams(CBaseChainParams::REGTEST); SelectParams(CBaseChainParams::REGTEST);
UpdateNetworkUpgradeParameters(Consensus::UPGRADE_OVERWINTER, 1); UpdateNetworkUpgradeParameters(Consensus::UPGRADE_OVERWINTER, 1);
UpdateNetworkUpgradeParameters(Consensus::UPGRADE_SAPLING, 1); UpdateNetworkUpgradeParameters(Consensus::UPGRADE_SAPLING, 1);
@@ -316,16 +300,6 @@ TEST_F(ContextualCheckBlockTest, BlockSaplingRulesRejectSproutTx) {
SCOPED_TRACE("BlockSaplingRulesRejectSproutTx"); SCOPED_TRACE("BlockSaplingRulesRejectSproutTx");
ExpectInvalidBlockFromTx(CTransaction(mtx), 100, "tx-overwinter-active"); ExpectInvalidBlockFromTx(CTransaction(mtx), 100, "tx-overwinter-active");
}
// Test block evaluated under Sapling rules cannot contain Overwinter transactions
TEST_F(ContextualCheckBlockTest, BlockSaplingRulesRejectOverwinterTx) {
SelectParams(CBaseChainParams::REGTEST);
UpdateNetworkUpgradeParameters(Consensus::UPGRADE_OVERWINTER, 1);
UpdateNetworkUpgradeParameters(Consensus::UPGRADE_SAPLING, 1);
CMutableTransaction mtx = GetFirstBlockTransaction();
// Make it an Overwinter transaction // Make it an Overwinter transaction
mtx.fOverwintered = true; mtx.fOverwintered = true;