Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: Fix AreInputsStandard test to reference the proper scriptPubKey #13565

Merged
merged 1 commit into from
Jul 10, 2018

Conversation

Empact
Copy link
Member

@Empact Empact commented Jun 28, 2018

This value doesn't affect the outcome of the test, because the values are
properly set on line 351 (https://github.com/bitcoin/bitcoin/pull/13565/files#diff-b7061098b41bd31ef5db043705441133R351), but this makes the test values internally coherent.

This value doesn't affect the outcome of the test, because the values are
properly set on line 351, but this makes the test values internally coherent.
@Empact
Copy link
Member Author

Empact commented Jun 28, 2018

Alternatively, if there's a way to remove this apparently ineffectual reference, I'd be curious to hear it.

@Empact Empact changed the title Fix AreInputsStandard test to reference the proper scriptPubKey test: Fix AreInputsStandard test to reference the proper scriptPubKey Jun 28, 2018
@fanquake fanquake added the Tests label Jun 28, 2018
@laanwj laanwj requested a review from theuni July 5, 2018 18:51
@laanwj
Copy link
Member

laanwj commented Jul 5, 2018

Adding @theuni as reviewer as he touched this line last.

@theuni
Copy link
Member

theuni commented Jul 6, 2018

Looks like it's been this way since introduction in 7f3b4e9. I'm confused about why this works as-is though, am I missing something obvious?

@maflcko
Copy link
Member

maflcko commented Jul 10, 2018

It works as is, because the check is done on the redeemScript derived from the scriptSig sixteenSigops and not on the scriptPubKey of the coin.

@maflcko
Copy link
Member

maflcko commented Jul 10, 2018

utACK f95989b

@maflcko maflcko merged commit f95989b into bitcoin:master Jul 10, 2018
maflcko pushed a commit that referenced this pull request Jul 10, 2018
…r scriptPubKey

f95989b Fix AreInputsStandard test to reference the proper scriptPubKey (Ben Woosley)

Pull request description:

  This value doesn't affect the outcome of the test, because the values are
  properly set on line 351 (https://github.com/bitcoin/bitcoin/pull/13565/files#diff-b7061098b41bd31ef5db043705441133R351), but this makes the test values internally coherent.

Tree-SHA512: 5a5fda843475abd91f6c366315536d3573e70420d7c6abeebd74a54939d4de774c33faad4560d1fd4b2c35006224d9e7b3a8c925fe9926013586fd1f7aa886cc
@Empact Empact deleted the p2sh-tests-pub-key branch July 10, 2018 14:43
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Apr 10, 2020
…criptPubKey

Summary:
f95989b Fix AreInputsStandard test to reference the proper scriptPubKey (Ben Woosley)

Pull request description:

  This value doesn't affect the outcome of the test, because the values are
  properly set on line 351 (https://github.com/bitcoin/bitcoin/pull/13565/files#diff-b7061098b41bd31ef5db043705441133R351), but this makes the test values internally coherent.

---

This is a backport of Core [[bitcoin/bitcoin#13565 | PR13565]]

Test Plan:
  ninja check
  ninja check-functional

Reviewers: O1 Bitcoin ABC, #bitcoin_abc, nakihito, deadalnix

Reviewed By: O1 Bitcoin ABC, #bitcoin_abc, nakihito, deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D5699
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 9, 2020
…e proper scriptPubKey

f95989b Fix AreInputsStandard test to reference the proper scriptPubKey (Ben Woosley)

Pull request description:

  This value doesn't affect the outcome of the test, because the values are
  properly set on line 351 (https://github.com/bitcoin/bitcoin/pull/13565/files#diff-b7061098b41bd31ef5db043705441133R351), but this makes the test values internally coherent.

Tree-SHA512: 5a5fda843475abd91f6c366315536d3573e70420d7c6abeebd74a54939d4de774c33faad4560d1fd4b2c35006224d9e7b3a8c925fe9926013586fd1f7aa886cc
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 9, 2020
…e proper scriptPubKey

f95989b Fix AreInputsStandard test to reference the proper scriptPubKey (Ben Woosley)

Pull request description:

  This value doesn't affect the outcome of the test, because the values are
  properly set on line 351 (https://github.com/bitcoin/bitcoin/pull/13565/files#diff-b7061098b41bd31ef5db043705441133R351), but this makes the test values internally coherent.

Tree-SHA512: 5a5fda843475abd91f6c366315536d3573e70420d7c6abeebd74a54939d4de774c33faad4560d1fd4b2c35006224d9e7b3a8c925fe9926013586fd1f7aa886cc
ftrader pushed a commit to bitcoin-cash-node/bitcoin-cash-node that referenced this pull request Aug 17, 2020
…criptPubKey

Summary:
f95989b Fix AreInputsStandard test to reference the proper scriptPubKey (Ben Woosley)

Pull request description:

  This value doesn't affect the outcome of the test, because the values are
  properly set on line 351 (https://github.com/bitcoin/bitcoin/pull/13565/files#diff-b7061098b41bd31ef5db043705441133R351), but this makes the test values internally coherent.

---

This is a backport of Core [[bitcoin/bitcoin#13565 | PR13565]]

Test Plan:
  ninja check
  ninja check-functional

Reviewers: O1 Bitcoin ABC, #bitcoin_abc, nakihito, deadalnix

Reviewed By: O1 Bitcoin ABC, #bitcoin_abc, nakihito, deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D5699
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants