diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-07-14 10:57:45 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-07-14 10:58:37 +0200 |
| commit | af9b7a9f2f73b1a2f9728106774dd13e8d1cdd8d (patch) | |
| tree | 0f37bcc364a8775cfcffd6812b2eeb6977d8fb62 | |
| parent | ca40ef6029c1b4f2984e767b6c335dca6d637388 (diff) | |
| parent | 66668c420a23936cb228737f982ee58c08211071 (diff) | |
Merge #8340: [qa] Solve trivial merge conflict in p2p-segwit.py
66668c4 [qa] Solve merge conflict of 4324bd237c3147fc153ba5046c211f03e8ac956a (MarcoFalke)
| -rwxr-xr-x | qa/rpc-tests/p2p-segwit.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py index 9d64c5fe36..b30d41af92 100755 --- a/qa/rpc-tests/p2p-segwit.py +++ b/qa/rpc-tests/p2p-segwit.py @@ -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') |