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

Ensure SCOPED_TRACE falls out of scope when necessary

Browse Source
This commit is contained in:
Jack Grigg
2018-08-30 14:41:50 +01:00
parent e601446adc
commit d70d103ee0
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/gtest/test_checkblock.cpp
View File

@@ -250,16 +250,20 @@ TEST_F(ContextualCheckBlockTest, BlockSproutRulesRejectOtherTx) {
mtx.nVersion = OVERWINTER_TX_VERSION; mtx.nVersion = OVERWINTER_TX_VERSION;
mtx.nVersionGroupId = OVERWINTER_VERSION_GROUP_ID; mtx.nVersionGroupId = OVERWINTER_VERSION_GROUP_ID;
SCOPED_TRACE("BlockSproutRulesRejectOverwinterTx"); {
ExpectInvalidBlockFromTx(CTransaction(mtx), 0, "tx-overwinter-not-active"); SCOPED_TRACE("BlockSproutRulesRejectOverwinterTx");
ExpectInvalidBlockFromTx(CTransaction(mtx), 0, "tx-overwinter-not-active");
}
// Make it a Sapling transaction // Make it a Sapling transaction
mtx.fOverwintered = true; mtx.fOverwintered = true;
mtx.nVersion = SAPLING_TX_VERSION; mtx.nVersion = SAPLING_TX_VERSION;
mtx.nVersionGroupId = SAPLING_VERSION_GROUP_ID; mtx.nVersionGroupId = SAPLING_VERSION_GROUP_ID;
SCOPED_TRACE("BlockSproutRulesRejectSaplingTx"); {
ExpectInvalidBlockFromTx(CTransaction(mtx), 0, "tx-overwinter-not-active"); SCOPED_TRACE("BlockSproutRulesRejectSaplingTx");
ExpectInvalidBlockFromTx(CTransaction(mtx), 0, "tx-overwinter-not-active");
}
}; };
@@ -274,16 +278,20 @@ TEST_F(ContextualCheckBlockTest, BlockOverwinterRulesRejectOtherTx) {
// Set the version to Sprout+JoinSplit (but nJoinSplit will be 0). // Set the version to Sprout+JoinSplit (but nJoinSplit will be 0).
mtx.nVersion = 2; mtx.nVersion = 2;
SCOPED_TRACE("BlockOverwinterRulesRejectSproutTx"); {
ExpectInvalidBlockFromTx(CTransaction(mtx), 100, "tx-overwinter-active"); SCOPED_TRACE("BlockOverwinterRulesRejectSproutTx");
ExpectInvalidBlockFromTx(CTransaction(mtx), 100, "tx-overwinter-active");
}
// Make it a Sapling transaction // Make it a Sapling transaction
mtx.fOverwintered = true; mtx.fOverwintered = true;
mtx.nVersion = SAPLING_TX_VERSION; mtx.nVersion = SAPLING_TX_VERSION;
mtx.nVersionGroupId = SAPLING_VERSION_GROUP_ID; mtx.nVersionGroupId = SAPLING_VERSION_GROUP_ID;
SCOPED_TRACE("BlockOverwinterRulesRejectSaplingTx"); {
ExpectInvalidBlockFromTx(CTransaction(mtx), 100, "bad-overwinter-tx-version-group-id"); SCOPED_TRACE("BlockOverwinterRulesRejectSaplingTx");
ExpectInvalidBlockFromTx(CTransaction(mtx), 100, "bad-overwinter-tx-version-group-id");
}
} }
@@ -298,14 +306,18 @@ TEST_F(ContextualCheckBlockTest, BlockSaplingRulesRejectOtherTx) {
// Set the version to Sprout+JoinSplit (but nJoinSplit will be 0). // Set the version to Sprout+JoinSplit (but nJoinSplit will be 0).
mtx.nVersion = 2; mtx.nVersion = 2;
SCOPED_TRACE("BlockSaplingRulesRejectSproutTx"); {
ExpectInvalidBlockFromTx(CTransaction(mtx), 100, "tx-overwinter-active"); SCOPED_TRACE("BlockSaplingRulesRejectSproutTx");
ExpectInvalidBlockFromTx(CTransaction(mtx), 100, "tx-overwinter-active");
}
// Make it an Overwinter transaction // Make it an Overwinter transaction
mtx.fOverwintered = true; mtx.fOverwintered = true;
mtx.nVersion = OVERWINTER_TX_VERSION; mtx.nVersion = OVERWINTER_TX_VERSION;
mtx.nVersionGroupId = OVERWINTER_VERSION_GROUP_ID; mtx.nVersionGroupId = OVERWINTER_VERSION_GROUP_ID;
SCOPED_TRACE("BlockSaplingRulesRejectOverwinterTx"); {
ExpectInvalidBlockFromTx(CTransaction(mtx), 100, "bad-sapling-tx-version-group-id"); SCOPED_TRACE("BlockSaplingRulesRejectOverwinterTx");
ExpectInvalidBlockFromTx(CTransaction(mtx), 100, "bad-sapling-tx-version-group-id");
}
} }