diff options
| author | Chris Stewart <[email protected]> | 2016-05-23 14:23:07 -0500 |
|---|---|---|
| committer | Chris Stewart <[email protected]> | 2016-05-30 08:51:37 -0500 |
| commit | b682960a28137966306e0a3646c96fa5f4b811ff (patch) | |
| tree | d06992163d7d93ad95a93a90e0cd8dbb822ef64f /src/test/script_tests.cpp | |
| parent | Merge #8047: [qa] test_framework: Set wait-timeout for bitcoind procs (diff) | |
| download | discoin-b682960a28137966306e0a3646c96fa5f4b811ff.tar.xz discoin-b682960a28137966306e0a3646c96fa5f4b811ff.zip | |
Adding P2SH(p2pkh) script test case
Fixing formatting
Adding test case into automatically generated test case set
Clean up commits
removing extra whitespace from eol
Removing extra whitespace on macro line
Diffstat (limited to 'src/test/script_tests.cpp')
| -rw-r--r-- | src/test/script_tests.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 5e9711a4a..39089f103 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -427,7 +427,10 @@ BOOST_AUTO_TEST_CASE(script_build) tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0C) << OP_CHECKSIG, "P2SH(P2PK), bad redeemscript", SCRIPT_VERIFY_P2SH, true ).PushSig(keys.key0).PushRedeem().DamagePush(10).ScriptError(SCRIPT_ERR_EVAL_FALSE)); - + + tests.push_back(TestBuilder(CScript() << OP_DUP << OP_HASH160 << ToByteVector(keys.pubkey0.GetID()) << OP_EQUALVERIFY << OP_CHECKSIG, + "P2SH(P2PKH)", SCRIPT_VERIFY_P2SH, true + ).PushSig(keys.key0).Push(keys.pubkey0).PushRedeem()); tests.push_back(TestBuilder(CScript() << OP_DUP << OP_HASH160 << ToByteVector(keys.pubkey1.GetID()) << OP_EQUALVERIFY << OP_CHECKSIG, "P2SH(P2PKH), bad sig but no VERIFY_P2SH", 0, true ).PushSig(keys.key0).DamagePush(10).PushRedeem()); |