Adding P2SH(p2pkh) script test case #8090

pull Christewart wants to merge 1 commits into bitcoin:master from Christewart:add_p2sh_p2pkh_script_test changing 2 files +11 −1

Christewart commented at 7:25 PM on May 23, 2016: member

The happy path for a p2sh script with redeem script type p2pkh was previously untested, adding a test case for this inside of script_tests.json
paveljanik commented at 5:49 AM on May 24, 2016: contributor

Please squash into one commit (see https://github.com/bitcoin/bitcoin/pull/8034/commits/90963e53707cf244e6a2a804341e9280628b0c34#diff-6a3371457528722a734f3c51d9238c13R46).
Christewart force-pushed on May 24, 2016
Christewart commented at 1:56 PM on May 24, 2016: member

Not sure why Travis CI failed on this build - I don't know Travis CI that well but it looks like it is unrelated to my change?
sdaftuar commented at 2:45 PM on May 24, 2016: member

Agree that the failure looks unrelated. But yikes, that looks like a somewhat scary error that was stumbled upon, will investigate...
paveljanik commented at 4:50 PM on May 24, 2016: contributor

ACK https://github.com/bitcoin/bitcoin/pull/8090/commits/32833a4d96023bdbc28ae1e9d441cfdb1e2f9e8e

Travis failure is indeed unrelated.
Christewart commented at 1:36 AM on May 25, 2016: member

@paveljanik @sdaftuar Is there a way to restart this travis build?
paveljanik commented at 9:38 AM on May 25, 2016: contributor

Lokks like it is already done - all checks have passed.
sipa commented at 1:52 PM on May 25, 2016: member

@Christewart Please don't add manually created test cases inside the "automically generated test cases" block, as that block gets overwritten.

Ideally, add this as an automatically generated test here: https://github.com/bitcoin/bitcoin/blob/v0.12.1/src/test/script_tests.cpp#L353
Christewart force-pushed on May 27, 2016

in src/test/script_tests.cpp:None in 266f60a45f outdated

  30 | @@ -31,7 +31,7 @@
  31 |  using namespace std;
  32 |  
  33 |  // Uncomment if you want to output updated JSON tests.
  34 | -// #define UPDATE_JSON_TESTS
  35 | +//#define UPDATE_JSON_TESTS

laanwj commented at 8:18 AM on May 30, 2016:

This should not be changed

laanwj commented at 8:19 AM on May 30, 2016: member

Sorry for this taking so long, just moving the test case would have been fine, but now that you change script_tests.cpp you need to make sure it doesn't generate the new json every time.

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

b682960a28

Christewart force-pushed on May 30, 2016
Christewart commented at 5:56 PM on May 30, 2016: member

@laanwj Should be fixed - I always seem to add unnecessary spaces/new lines without realizing it in my commits :-)
sipa commented at 5:58 PM on May 30, 2016: member

utACK b682960a28137966306e0a3646c96fa5f4b811ff

in src/test/script_tests.cpp:None in b682960a28

 426 | @@ -427,7 +427,10 @@ BOOST_AUTO_TEST_CASE(script_build)
 427 |      tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0C) << OP_CHECKSIG,
 428 |                                  "P2SH(P2PK), bad redeemscript", SCRIPT_VERIFY_P2SH, true
 429 |                                 ).PushSig(keys.key0).PushRedeem().DamagePush(10).ScriptError(SCRIPT_ERR_EVAL_FALSE));
 430 | -
 431 | +

paveljanik commented at 6:04 PM on May 30, 2016:

Pure cosmetic nit: you have added tab here.

laanwj commented at 1:27 PM on May 31, 2016:

Nit^2: I think it's not a tab but four spaces :snail:

paveljanik commented at 6:04 PM on May 30, 2016: contributor

utACK https://github.com/bitcoin/bitcoin/commit/b682960a28137966306e0a3646c96fa5f4b811ff
laanwj merged this on May 31, 2016
laanwj closed this on May 31, 2016
laanwj referenced this in commit a2df115249 on May 31, 2016
laanwj commented at 1:27 PM on May 31, 2016: member

Not going to hold this up on a cosmetic nit.
codablock referenced this in commit edbefcc877 on Sep 16, 2017
codablock referenced this in commit 321ff20a93 on Sep 19, 2017
codablock referenced this in commit d8c5a59005 on Dec 22, 2017
andvgal referenced this in commit 95cc12dfda on Jan 6, 2019
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#8096 Rare sendheaders.py failure