Skip to content

Commit

Permalink
remove redundant tests in p2p-segwit.py
Browse files Browse the repository at this point in the history
Github-Pull: #8499
Rebased-From: 67d6ee1e3679504f46473fe0818970565ff3b137
  • Loading branch information
jl2012 authored and laanwj committed Oct 17, 2016
1 parent fef7b46 commit 9777fe1
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions qa/rpc-tests/p2p-segwit.py
Original file line number Diff line number Diff line change
Expand Up @@ -1869,16 +1869,11 @@ def test_non_standard_witness(self):

# Stack element size over 80 bytes is non-standard
p2wsh_txs[1].wit.vtxinwit[0].scriptWitness.stack = [pad * 81] * 100 + [scripts[1]]
# It can't be used to blind a node to the transaction
self.std_node.announce_tx_and_wait_for_getdata(p2wsh_txs[1])
self.std_node.test_transaction_acceptance(p2wsh_txs[1], True, False, b'bad-witness-nonstandard')
self.std_node.announce_tx_and_wait_for_getdata(p2wsh_txs[1])
self.std_node.test_transaction_acceptance(p2wsh_txs[1], True, False, b'bad-witness-nonstandard')
# Non-standard nodes should accept
self.test_node.test_transaction_acceptance(p2wsh_txs[1], True, True)
# Standard nodes should accept if element size is not over 80 bytes
p2wsh_txs[1].wit.vtxinwit[0].scriptWitness.stack = [pad * 80] * 100 + [scripts[1]]
self.std_node.announce_tx_and_wait_for_getdata(p2wsh_txs[1])
self.std_node.test_transaction_acceptance(p2wsh_txs[1], True, True)

# witnessScript size at 3600 bytes is standard
Expand All @@ -1897,13 +1892,9 @@ def test_non_standard_witness(self):
self.std_node.test_transaction_acceptance(p2sh_txs[0], True, False, b'bad-witness-nonstandard')
self.test_node.test_transaction_acceptance(p2sh_txs[0], True, True)
p2sh_txs[1].wit.vtxinwit[0].scriptWitness.stack = [pad * 81] * 100 + [scripts[1]]
self.std_node.announce_tx_and_wait_for_getdata(p2sh_txs[1])
self.std_node.test_transaction_acceptance(p2sh_txs[1], True, False, b'bad-witness-nonstandard')
self.std_node.announce_tx_and_wait_for_getdata(p2sh_txs[1])
self.std_node.test_transaction_acceptance(p2sh_txs[1], True, False, b'bad-witness-nonstandard')
self.test_node.test_transaction_acceptance(p2sh_txs[1], True, True)
p2sh_txs[1].wit.vtxinwit[0].scriptWitness.stack = [pad * 80] * 100 + [scripts[1]]
self.std_node.announce_tx_and_wait_for_getdata(p2sh_txs[1])
self.std_node.test_transaction_acceptance(p2sh_txs[1], True, True)
p2sh_txs[2].wit.vtxinwit[0].scriptWitness.stack = [pad, pad, scripts[2]]
self.test_node.test_transaction_acceptance(p2sh_txs[2], True, True)
Expand Down

0 comments on commit 9777fe1

Please sign in to comment.