BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

66668c4 [qa] Solve merge conflict of 4324bd237c (MarcoFalke)
This commit is contained in:
MarcoFalke 2016-07-14 10:57:45 +02:00
parent ca40ef6029 66668c420a
commit af9b7a9f2f
No known key found for this signature in database
GPG Key ID: 2D7F2372E50FE137
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/rpc-tests/p2p-segwit.py
View File

@ -306,7 +306,7 @@ class SegWitTest(BitcoinTestFramework):
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')