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

Rename vpour to vjoinsplit.

Browse Source
This commit is contained in:
Sean Bowe
2016-07-10 23:08:20 -06:00
parent a8c68ffe99
commit 8675d94b63
13 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/test/coins_tests.cpp
View File

@@ -251,7 +251,7 @@ BOOST_AUTO_TEST_CASE(chained_pours)
{
CMutableTransaction mtx;
mtx.vpour.push_back(ptx2);
mtx.vjoinsplit.push_back(ptx2);
BOOST_CHECK(!cache.HavePourRequirements(mtx));
}
@@ -260,35 +260,35 @@ BOOST_AUTO_TEST_CASE(chained_pours)
// ptx2 is trying to anchor to ptx1 but ptx1
// appears afterwards -- not a permitted ordering
CMutableTransaction mtx;
mtx.vpour.push_back(ptx2);
mtx.vpour.push_back(ptx1);
mtx.vjoinsplit.push_back(ptx2);
mtx.vjoinsplit.push_back(ptx1);
BOOST_CHECK(!cache.HavePourRequirements(mtx));
}
{
CMutableTransaction mtx;
mtx.vpour.push_back(ptx1);
mtx.vpour.push_back(ptx2);
mtx.vjoinsplit.push_back(ptx1);
mtx.vjoinsplit.push_back(ptx2);
BOOST_CHECK(cache.HavePourRequirements(mtx));
}
{
CMutableTransaction mtx;
mtx.vpour.push_back(ptx1);
mtx.vpour.push_back(ptx2);
mtx.vpour.push_back(ptx3);
mtx.vjoinsplit.push_back(ptx1);
mtx.vjoinsplit.push_back(ptx2);
mtx.vjoinsplit.push_back(ptx3);
BOOST_CHECK(cache.HavePourRequirements(mtx));
}
{
CMutableTransaction mtx;
mtx.vpour.push_back(ptx1);
mtx.vpour.push_back(ptx1b);
mtx.vpour.push_back(ptx2);
mtx.vpour.push_back(ptx3);
mtx.vjoinsplit.push_back(ptx1);
mtx.vjoinsplit.push_back(ptx1b);
mtx.vjoinsplit.push_back(ptx2);
mtx.vjoinsplit.push_back(ptx3);
BOOST_CHECK(cache.HavePourRequirements(mtx));
}

2
src/test/sighash_tests.cpp
View File

@@ -140,7 +140,7 @@ void static RandomTransaction(CMutableTransaction &tx, bool fSingle) {
pourtx.macs[0] = GetRandHash();
pourtx.macs[1] = GetRandHash();
tx.vpour.push_back(pourtx);
tx.vjoinsplit.push_back(pourtx);
}
unsigned char joinSplitPrivKey[crypto_sign_SECRETKEYBYTES];

24
src/test/transaction_tests.cpp
View File

@@ -393,8 +393,8 @@ BOOST_AUTO_TEST_CASE(test_simple_pour_invalidity)
BOOST_CHECK(!CheckTransactionWithoutProofVerification(newTx, state));
BOOST_CHECK(state.GetRejectReason() == "bad-txns-vout-empty");
newTx.vpour.push_back(JSDescription());
JSDescription *pourtx = &newTx.vpour[0];
newTx.vjoinsplit.push_back(JSDescription());
JSDescription *pourtx = &newTx.vjoinsplit[0];
pourtx->serials[0] = GetRandHash();
pourtx->serials[1] = GetRandHash();
@@ -422,9 +422,9 @@ BOOST_AUTO_TEST_CASE(test_simple_pour_invalidity)
CMutableTransaction newTx(tx);
CValidationState state;
newTx.vpour.push_back(JSDescription());
newTx.vjoinsplit.push_back(JSDescription());
JSDescription *pourtx = &newTx.vpour[0];
JSDescription *pourtx = &newTx.vjoinsplit[0];
pourtx->vpub_old = -1;
BOOST_CHECK(!CheckTransaction(newTx, state));
@@ -448,9 +448,9 @@ BOOST_AUTO_TEST_CASE(test_simple_pour_invalidity)
pourtx->vpub_new = (MAX_MONEY / 2) + 10;
newTx.vpour.push_back(JSDescription());
newTx.vjoinsplit.push_back(JSDescription());
JSDescription *pourtx2 = &newTx.vpour[1];
JSDescription *pourtx2 = &newTx.vjoinsplit[1];
pourtx2->vpub_new = (MAX_MONEY / 2) + 10;
BOOST_CHECK(!CheckTransaction(newTx, state));
@@ -461,8 +461,8 @@ BOOST_AUTO_TEST_CASE(test_simple_pour_invalidity)
CMutableTransaction newTx(tx);
CValidationState state;
newTx.vpour.push_back(JSDescription());
JSDescription *pourtx = &newTx.vpour[0];
newTx.vjoinsplit.push_back(JSDescription());
JSDescription *pourtx = &newTx.vjoinsplit[0];
pourtx->serials[0] = GetRandHash();
pourtx->serials[1] = pourtx->serials[0];
@@ -472,8 +472,8 @@ BOOST_AUTO_TEST_CASE(test_simple_pour_invalidity)
pourtx->serials[1] = GetRandHash();
newTx.vpour.push_back(JSDescription());
JSDescription *pourtx2 = &newTx.vpour[1];
newTx.vjoinsplit.push_back(JSDescription());
JSDescription *pourtx2 = &newTx.vjoinsplit[1];
pourtx2->serials[0] = GetRandHash();
pourtx2->serials[1] = pourtx->serials[0];
@@ -486,8 +486,8 @@ BOOST_AUTO_TEST_CASE(test_simple_pour_invalidity)
CMutableTransaction newTx(tx);
CValidationState state;
newTx.vpour.push_back(JSDescription());
JSDescription *pourtx = &newTx.vpour[0];
newTx.vjoinsplit.push_back(JSDescription());
JSDescription *pourtx = &newTx.vjoinsplit[0];
pourtx->serials[0] = GetRandHash();
pourtx->serials[1] = GetRandHash();