kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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

66668c4 [qa] Solve merge conflict of 4324bd237c (MarcoFalke)
0.13
MarcoFalke 8 years ago
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
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      qa/rpc-tests/p2p-segwit.py

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

@ -306,7 +306,7 @@ class SegWitTest(BitcoinTestFramework):
tx3 = CTransaction() tx3 = CTransaction()
tx3.vin.append(CTxIn(COutPoint(tx2.sha256, 0), CScript([p2sh_program]))) tx3.vin.append(CTxIn(COutPoint(tx2.sha256, 0), CScript([p2sh_program])))
tx3.vout.append(CTxOut(tx2.vout[0].nValue-1000, scriptPubKey)) 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.wit.vtxinwit[0].scriptWitness.stack = [b'a'*400000]
tx3.rehash() tx3.rehash()
self.std_node.test_transaction_acceptance(tx3, True, False, b'no-witness-yet') self.std_node.test_transaction_acceptance(tx3, True, False, b'no-witness-yet')

Write Preview
Loading…
Cancel
Save