Retract partial Orchard test support.
Testing for Orchard transaction construction will be introduced separately.
This commit is contained in:
parent
1f7aaf2368
commit
d882c68274
|
@ -58,7 +58,6 @@ public:
|
||||||
|
|
||||||
void CreateJoinSplitSignature(CMutableTransaction& mtx, uint32_t consensusBranchId);
|
void CreateJoinSplitSignature(CMutableTransaction& mtx, uint32_t consensusBranchId);
|
||||||
|
|
||||||
// TODO If creating a zip225 (v5) tx, we need to be told whether to create sprout elements or orchard elements.
|
|
||||||
CMutableTransaction GetValidTransaction(uint32_t consensusBranchId=SPROUT_BRANCH_ID) {
|
CMutableTransaction GetValidTransaction(uint32_t consensusBranchId=SPROUT_BRANCH_ID) {
|
||||||
CMutableTransaction mtx;
|
CMutableTransaction mtx;
|
||||||
if (consensusBranchId == NetworkUpgradeInfo[Consensus::UPGRADE_OVERWINTER].nBranchId) {
|
if (consensusBranchId == NetworkUpgradeInfo[Consensus::UPGRADE_OVERWINTER].nBranchId) {
|
||||||
|
@ -69,11 +68,6 @@ CMutableTransaction GetValidTransaction(uint32_t consensusBranchId=SPROUT_BRANCH
|
||||||
mtx.fOverwintered = true;
|
mtx.fOverwintered = true;
|
||||||
mtx.nVersionGroupId = SAPLING_VERSION_GROUP_ID;
|
mtx.nVersionGroupId = SAPLING_VERSION_GROUP_ID;
|
||||||
mtx.nVersion = SAPLING_TX_VERSION;
|
mtx.nVersion = SAPLING_TX_VERSION;
|
||||||
} else if (consensusBranchId == NetworkUpgradeInfo[Consensus::UPGRADE_NU5].nBranchId) {
|
|
||||||
mtx.fOverwintered = true;
|
|
||||||
mtx.nVersionGroupId = ZIP225_VERSION_GROUP_ID;
|
|
||||||
mtx.nVersion = ZIP225_TX_VERSION;
|
|
||||||
mtx.nConsensusBranchId = consensusBranchId; // XXX should this be moved outside the conditional?
|
|
||||||
} else if (consensusBranchId != SPROUT_BRANCH_ID) {
|
} else if (consensusBranchId != SPROUT_BRANCH_ID) {
|
||||||
// Unsupported consensus branch ID
|
// Unsupported consensus branch ID
|
||||||
assert(false);
|
assert(false);
|
||||||
|
@ -130,8 +124,6 @@ void CreateJoinSplitSignature(CMutableTransaction& mtx, uint32_t consensusBranch
|
||||||
TEST(ChecktransactionTests, ValidTransaction) {
|
TEST(ChecktransactionTests, ValidTransaction) {
|
||||||
CMutableTransaction mtx = GetValidTransaction();
|
CMutableTransaction mtx = GetValidTransaction();
|
||||||
CTransaction tx(mtx);
|
CTransaction tx(mtx);
|
||||||
EXPECT_FALSE(tx.GetOrchardBundle().OutputsEnabled());
|
|
||||||
EXPECT_FALSE(tx.GetOrchardBundle().SpendsEnabled());
|
|
||||||
MockCValidationState state;
|
MockCValidationState state;
|
||||||
EXPECT_TRUE(CheckTransactionWithoutProofVerification(tx, state));
|
EXPECT_TRUE(CheckTransactionWithoutProofVerification(tx, state));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue