highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 22:50:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor script validation to observe amounts

Browse Source 
This is a preparation for BIP143 support.
This commit is contained in:
Pieter Wuille
2016-03-31 14:51:29 +02:00
parent b8a97498df
commit 0ef1dd3e11
13 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/transaction_tests.cpp
View File

@@ -149,9 +149,10 @@ BOOST_AUTO_TEST_CASE(tx_valid)
break;
}
CAmount amount = 0;
unsigned int verify_flags = ParseScriptFlags(test[2].get_str());
BOOST_CHECK_MESSAGE(VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
NULL, verify_flags, TransactionSignatureChecker(&tx, i), &err),
NULL, verify_flags, TransactionSignatureChecker(&tx, i, amount), &err),
strTest);
BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
}
@@ -224,8 +225,9 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
}
unsigned int verify_flags = ParseScriptFlags(test[2].get_str());
CAmount amount = 0;
fValid = VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
NULL, verify_flags, TransactionSignatureChecker(&tx, i), &err);
NULL, verify_flags, TransactionSignatureChecker(&tx, i, amount), &err);
}
BOOST_CHECK_MESSAGE(!fValid, strTest);
BOOST_CHECK_MESSAGE(err != SCRIPT_ERR_OK, ScriptErrorString(err));