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

66668c4 [qa] Solve merge conflict of 4324bd2 (MarcoFalke)
bitcoin · Jul 14, 2016 · af9b7a9 · af9b7a9
2 parents ca40ef6 + 66668c4
commit af9b7a9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/qa/rpc-tests/p2p-segwit.py b/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')