From ef68c19d59eae4809844a4a00144f09661c14cb1 Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Thu, 16 Feb 2017 11:16:52 -0500 Subject: [PATCH] fix transaction_tests with assets and explicit fee output --- src/test/transaction_tests.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index d659efe6f1..2733c2c4de 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -309,15 +309,19 @@ SetupDummyInputs(CBasicKeyStore& keystoreRet, CCoinsViewCache& coinsRet) dummyTransactions[0].vout.resize(2); dummyTransactions[0].vout[0].nValue = 11*CENT; dummyTransactions[0].vout[0].scriptPubKey << ToByteVector(key[0].GetPubKey()) << OP_CHECKSIG; + dummyTransactions[0].vout[0].nAsset = BITCOINID; dummyTransactions[0].vout[1].nValue = 50*CENT; dummyTransactions[0].vout[1].scriptPubKey << ToByteVector(key[1].GetPubKey()) << OP_CHECKSIG; + dummyTransactions[0].vout[1].nAsset = BITCOINID; coinsRet.ModifyCoins(dummyTransactions[0].GetHash())->FromTx(dummyTransactions[0], 0); dummyTransactions[1].vout.resize(2); dummyTransactions[1].vout[0].nValue = 21*CENT; dummyTransactions[1].vout[0].scriptPubKey = GetScriptForDestination(key[2].GetPubKey().GetID()); + dummyTransactions[1].vout[0].nAsset = BITCOINID; dummyTransactions[1].vout[1].nValue = 22*CENT; dummyTransactions[1].vout[1].scriptPubKey = GetScriptForDestination(key[3].GetPubKey().GetID()); + dummyTransactions[1].vout[1].nAsset = BITCOINID; coinsRet.ModifyCoins(dummyTransactions[1].GetHash())->FromTx(dummyTransactions[1], 0); return dummyTransactions; @@ -341,9 +345,13 @@ BOOST_AUTO_TEST_CASE(test_Get) t1.vin[2].prevout.hash = dummyTransactions[1].GetHash(); t1.vin[2].prevout.n = 1; t1.vin[2].scriptSig << std::vector(65, 0) << std::vector(33, 4); - t1.vout.resize(1); + t1.vout.resize(2); t1.vout[0].nValue = 90*CENT; t1.vout[0].scriptPubKey << OP_1; + t1.vout[0].nAsset = BITCOINID; + t1.vout[1].nValue = (50+21+22)*CENT - 90*CENT; + t1.vout[1].scriptPubKey = CScript(); + t1.vout[1].nAsset = BITCOINID; BOOST_CHECK(CTransaction(t1).GetFee()[BITCOINID] == (50+21+22)*CENT - 90*CENT); BOOST_CHECK(AreInputsStandard(t1, coins));