diff options
| author | Pieter Wuille <[email protected]> | 2017-09-22 16:10:09 -0700 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2017-09-22 16:17:44 -0700 |
| commit | aeed345c9bade5d52a3fbf0a943203f6c82e6344 (patch) | |
| tree | a015a9100036360a3c11e8e6decdfb786bf7f453 /src/test/script_P2SH_tests.cpp | |
| parent | Merge #11362: Remove nBlockMaxSize from miner opt struct as it is no longer u... (diff) | |
| parent | Rename out to m_tx_out in CScriptCheck (diff) | |
| download | discoin-aeed345c9bade5d52a3fbf0a943203f6c82e6344.tar.xz discoin-aeed345c9bade5d52a3fbf0a943203f6c82e6344.zip | |
Merge #10953: [Refactor] Combine scriptPubKey and amount as CTxOut in CScriptCheck
3a131b724 Rename out to m_tx_out in CScriptCheck (Johnson Lau)
e91211878 [Refactor] Combine scriptPubKey and amount as CTxOut in CScriptCheck (Johnson Lau)
Pull request description:
This simplifies CScriptCheck by combining scriptPubKey and amount
Tree-SHA512: 6422363cf5394c6cfefb30c1709db6def63230b809cc7697887e4a2e8c684149208edf91dd139e031b9fe732776b2db59305f77c3cba6f333b11cceb39ef0cc2
Diffstat (limited to 'src/test/script_P2SH_tests.cpp')
| -rw-r--r-- | src/test/script_P2SH_tests.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index efd0f77d9..58aa32c96 100644 --- a/src/test/script_P2SH_tests.cpp +++ b/src/test/script_P2SH_tests.cpp @@ -112,8 +112,7 @@ BOOST_AUTO_TEST_CASE(sign) { CScript sigSave = txTo[i].vin[0].scriptSig; txTo[i].vin[0].scriptSig = txTo[j].vin[0].scriptSig; - const CTxOut& output = txFrom.vout[txTo[i].vin[0].prevout.n]; - bool sigOK = CScriptCheck(output.scriptPubKey, output.nValue, txTo[i], 0, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC, false, &txdata)(); + bool sigOK = CScriptCheck(txFrom.vout[txTo[i].vin[0].prevout.n], txTo[i], 0, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC, false, &txdata)(); if (i == j) BOOST_CHECK_MESSAGE(sigOK, strprintf("VerifySignature %d %d", i, j)); else |