Permalink
Browse files

Merge #8340: [qa] Solve trivial merge conflict in p2p-segwit.py

66668c4 [qa] Solve merge conflict of 4324bd2 (MarcoFalke)
  • Loading branch information...
MarcoFalke committed Jul 14, 2016
2 parents ca40ef6 + 66668c4 commit af9b7a9f2f73b1a2f9728106774dd13e8d1cdd8d
Showing with 1 addition and 1 deletion.
  1. +1 −1 qa/rpc-tests/p2p-segwit.py
@@ -306,7 +306,7 @@ def test_unnecessary_witness_before_segwit_activation(self):
tx3 = CTransaction()
tx3.vin.append(CTxIn(COutPoint(tx2.sha256, 0), CScript([p2sh_program])))
tx3.vout.append(CTxOut(tx2.vout[0].nValue-1000, scriptPubKey))
tx3.wit.vtxinwit.append(CTxinWitness())
tx3.wit.vtxinwit.append(CTxInWitness())
tx3.wit.vtxinwit[0].scriptWitness.stack = [b'a'*400000]
tx3.rehash()
self.std_node.test_transaction_acceptance(tx3, True, False, b'no-witness-yet')

0 comments on commit af9b7a9

Please sign in to comment.