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.

Sign up for GitHub

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

Tests: enforce critical class instance attributes in functional tests, fix segwit test specificity #14305

Merged
merged 5 commits into from
Sep 27, 2018
Merged

Tests: enforce critical class instance attributes in functional tests, fix segwit test specificity #14305

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ba923e3
test: Fix broken segwit test
practicalswift Sep 23, 2018
1d0ce94
Fix for incorrect version attr set on functional test segwit block.
JustinTArthur Sep 24, 2018
3a4449e
Strictly enforce instance attrs in critical functional test classes.
JustinTArthur Sep 24, 2018
17b42f4
Check for specific tx acceptance failures based on script signature
JustinTArthur Sep 26, 2018
e460232
Document fixed attribute behavior in critical test framework classes.
JustinTArthur Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Check for specific tx acceptance failures based on script signature
  • Loading branch information
@JustinTArthur
JustinTArthur committed Sep 27, 2018
commit 17b42f4122740a7d9c91f3b42f77907e9cdcf680
8 changes: 6 additions & 2 deletions test/functional/p2p_segwit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,12 +769,16 @@ def test_p2sh_witness(self):
# will require a witness to spend a witness program regardless of
# segwit activation. Note that older bitcoind's that are not
# segwit-aware would also reject this for failing CLEANSTACK.
test_transaction_acceptance(self.nodes[0], self.test_node, spend_tx, with_witness=False, accepted=False)
with self.nodes[0].assert_debug_log(
expected_msgs=(spend_tx.hash, 'was not accepted: non-mandatory-script-verify-flag (Witness program was passed an empty witness)')):
test_transaction_acceptance(self.nodes[0], self.test_node, spend_tx, with_witness=False, accepted=False)

# Try to put the witness script in the scriptSig, should also fail.
spend_tx.vin[0].scriptSig = CScript([p2wsh_pubkey, b'a'])
spend_tx.rehash()
test_transaction_acceptance(self.nodes[0], self.test_node, spend_tx, with_witness=False, accepted=False)
with self.nodes[0].assert_debug_log(
expected_msgs=('Not relaying invalid transaction {}'.format(spend_tx.hash), 'was not accepted: mandatory-script-verify-flag-failed (Script evaluated without error but finished with a false/empty top stack element)')):
test_transaction_acceptance(self.nodes[0], self.test_node, spend_tx, with_witness=False, accepted=False)

# Now put the witness script in the witness, should succeed after
# segwit activates.
Expand Down