diff options
| author | Jeff Garzik <[email protected]> | 2012-11-15 14:49:06 -0800 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2012-11-15 14:49:06 -0800 |
| commit | 3b9f029defc2d579a3e2c1afbc0c959563a13527 (patch) | |
| tree | 72c34c5fe86b95be861f02fdfe5e497f24b56117 /src/test/script_P2SH_tests.cpp | |
| parent | Merge pull request #1984 from grimd34th/patch-2 (diff) | |
| parent | Introduce script verification flags (diff) | |
| download | discoin-3b9f029defc2d579a3e2c1afbc0c959563a13527.tar.xz discoin-3b9f029defc2d579a3e2c1afbc0c959563a13527.zip | |
Merge pull request #2008 from sipa/scriptflags
Introduce script verification flags
Diffstat (limited to 'src/test/script_P2SH_tests.cpp')
| -rw-r--r-- | src/test/script_P2SH_tests.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index 35069a3fd..b5107193f 100644 --- a/src/test/script_P2SH_tests.cpp +++ b/src/test/script_P2SH_tests.cpp @@ -13,8 +13,6 @@ using namespace std; // Test routines internal to script.cpp: extern uint256 SignatureHash(CScript scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType); -extern bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, - bool fValidatePayToScriptHash, bool fStrictEncodings, int nHashType); // Helpers: static std::vector<unsigned char> @@ -40,7 +38,7 @@ Verify(const CScript& scriptSig, const CScript& scriptPubKey, bool fStrict) txTo.vin[0].scriptSig = scriptSig; txTo.vout[0].nValue = 1; - return VerifyScript(scriptSig, scriptPubKey, txTo, 0, fStrict, true, 0); + return VerifyScript(scriptSig, scriptPubKey, txTo, 0, fStrict ? SCRIPT_VERIFY_P2SH : SCRIPT_VERIFY_NONE, 0); } @@ -105,7 +103,7 @@ BOOST_AUTO_TEST_CASE(sign) { CScript sigSave = txTo[i].vin[0].scriptSig; txTo[i].vin[0].scriptSig = txTo[j].vin[0].scriptSig; - bool sigOK = VerifySignature(CCoins(txFrom, 0), txTo[i], 0, true, true, 0); + bool sigOK = VerifySignature(CCoins(txFrom, 0), txTo[i], 0, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC, 0); if (i == j) BOOST_CHECK_MESSAGE(sigOK, strprintf("VerifySignature %d %d", i, j)); else |