Merge 0822b44 into merged_master (Bitcoin PR #15282)

apoelstra · Nov 9, 2020 · 3a0de44 · 3a0de44
2 parents 3b2e901 + 0822b44
commit 3a0de44
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
@@ -546,6 +546,9 @@ def gen_return_txouts():
     # concatenate 128 txouts of above script_pubkey which we'll insert before the txout for change
     txouts = []
     from .messages import CTxOut, CTxOutValue
+    txout = CTxOut()
+    txout.nValue = 0
+    txout.scriptPubKey = hex_str_to_bytes(script_pubkey)
     for k in range(128):
         txout = CTxOut()
         txout.nValue = CTxOutValue(0)
@@ -571,8 +574,8 @@ def create_lots_of_big_transactions(node, txouts, utxos, num, fee):
         tx.deserialize(BytesIO(hex_str_to_bytes(rawtx)))
         for txout in txouts:
             tx.vout.append(txout)
-        newrawtx = tx.serialize().hex()
-        signresult = node.signrawtransactionwithwallet(newrawtx, None, "NONE")
+        newtx = tx.serialize().hex()
+        signresult = node.signrawtransactionwithwallet(newtx, None, "NONE")
         txid = node.sendrawtransaction(signresult["hex"], 0)
         txids.append(txid)
     return txids