Avoid creating <= 64-byte transactions in most functional tests.

Author: TheBlueMatt

test/functional/p2p_ibd_stalling.py

@@ -82,7 +82,7 @@ def run_test(self):
 
         # Need to wait until 1023 blocks are received - the magic total bytes number is a workaround in lack of an rpc
         # returning the number of downloaded (but not connected) blocks.
-        bytes_recv = 172761 if not self.options.v2transport else 169692
+        bytes_recv = 172761+2*1023 if not self.options.v2transport else 169692+2*1023
         self.wait_until(lambda: self.total_bytes_recv_for_blocks() == bytes_recv)
 
         self.all_sync_send_with_ping(peers)

test/functional/test_framework/blocktools.py

@@ -38,6 +38,7 @@
     OP_0,
     OP_RETURN,
     OP_TRUE,
+    OP_DROP,
 )
 from .script_util import (
     key_to_p2pk_script,
@@ -164,7 +165,8 @@ def create_coinbase(height, pubkey=None, *, script_pubkey=None, extra_output_scr
     elif script_pubkey is not None:
         coinbaseoutput.scriptPubKey = script_pubkey
     else:
-        coinbaseoutput.scriptPubKey = CScript([OP_TRUE])
+        # Use two OP_TRUEs and an OP_DROP to ensure we're always > 64 bytes in non-witness size
+        coinbaseoutput.scriptPubKey = CScript([OP_TRUE, OP_TRUE, OP_DROP])
     coinbase.vout = [coinbaseoutput]
     if extra_output_script is not None:
         coinbaseoutput2 = CTxOut()
@@ -181,7 +183,7 @@ def create_tx_with_script(prevtx, n, script_sig=b"", *, amount, output_script=No
        Can optionally pass scriptPubKey and scriptSig, default is anyone-can-spend output.
     """
     if output_script is None:
-        output_script = CScript()
+        output_script = CScript([OP_TRUE, OP_DROP, OP_TRUE, OP_DROP])
     tx = CTransaction()
     assert n < len(prevtx.vout)
     tx.vin.append(CTxIn(COutPoint(prevtx.sha256, n), script_sig, SEQUENCE_FINAL))