Merge bitcoin#28727: test: replace random_bytes with random.randbytes

fe3ac37 test: replace random_bytes with randbytes bitcoin#28720 (ns-xvrn)

Pull request description:

  With Python upgraded to 3.9 replaced the `random_bytes` function in util of functional tests and replaced it's usage with `random.randbytes`.

  Closes bitcoin#28720.

ACKs for top commit:
  maflcko:
    lgtm ACK fe3ac37
  BrandonOdiwuor:
    ACK fe3ac37
  stickies-v:
    ACK fe3ac37, thanks for picking this up
  kristapsk:
    utACK fe3ac37

Tree-SHA512: f65a75e73ebd840c2936eb133d42bccd552f25b717c8ca25c18d06e0593e12f292389cfcc0a0b0759004b67a46ea0c8ac237973ef90f246139778230be1e64e1

Adding random back to utils.py as it is used in other places

Replacing random_bytes with random.randbytes

Author: fanquake

test/functional/mempool_datacarrier.py

@@ -13,12 +13,11 @@
 )
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.test_node import TestNode
-from test_framework.util import (
-    assert_raises_rpc_error,
-    random_bytes,
-)
+from test_framework.util import assert_raises_rpc_error
 from test_framework.wallet import MiniWallet
 
+from random import randbytes
+
 
 class DataCarrierTest(BitcoinTestFramework):
     def set_test_params(self):
@@ -49,11 +48,11 @@ def run_test(self):
         self.wallet.rescan_utxos()
 
         # By default, only 80 bytes are used for data (+1 for OP_RETURN, +2 for the pushdata opcodes).
-        default_size_data = random_bytes(MAX_OP_RETURN_RELAY - 3)
-        too_long_data = random_bytes(MAX_OP_RETURN_RELAY - 2)
-        small_data = random_bytes(MAX_OP_RETURN_RELAY - 4)
-        one_byte = random_bytes(1)
-        zero_bytes = random_bytes(0)
+        default_size_data = randbytes(MAX_OP_RETURN_RELAY - 3)
+        too_long_data = randbytes(MAX_OP_RETURN_RELAY - 2)
+        small_data = randbytes(MAX_OP_RETURN_RELAY - 4)
+        one_byte = randbytes(1)
+        zero_bytes = randbytes(0)
 
         self.log.info("Testing null data transaction with default -datacarrier and -datacarriersize values.")
         self.test_null_data_transaction(node=self.nodes[0], data=default_size_data, success=True)

test/functional/p2p_net_deadlock.py

@@ -6,7 +6,7 @@
 import threading
 from test_framework.messages import MAX_PROTOCOL_MESSAGE_LENGTH
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import random_bytes
+from random import randbytes
 
 class NetDeadlockTest(BitcoinTestFramework):
     def set_test_params(self):
@@ -18,7 +18,7 @@ def run_test(self):
         node1 = self.nodes[1]
 
         self.log.info("Simultaneously send a large message on both sides")
-        rand_msg = random_bytes(MAX_PROTOCOL_MESSAGE_LENGTH).hex()
+        rand_msg = randbytes(MAX_PROTOCOL_MESSAGE_LENGTH).hex()
 
         thread0 = threading.Thread(target=node0.sendmsgtopeer, args=(0, "unknown", rand_msg))
         thread1 = threading.Thread(target=node1.sendmsgtopeer, args=(0, "unknown", rand_msg))

test/functional/p2p_v2_misbehaving.py

@@ -7,7 +7,6 @@
 from enum import Enum
 
 from test_framework.messages import MAGIC_BYTES
-from test_framework.util import random_bytes
 from test_framework.p2p import P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import random_bitflip
@@ -91,7 +90,7 @@ def complete_handshake(self, response):
 class NonEmptyVersionPacketState(EncryptedP2PState):
     """"Add option for sending non-empty transport version packet."""
     def complete_handshake(self, response):
-        self.transport_version = random_bytes(5)
+        self.transport_version = random.randbytes(5)
         return super().complete_handshake(response)
 
 

test/functional/rpc_psbt.py

@@ -7,6 +7,7 @@
 
 from decimal import Decimal
 from itertools import product
+from random import randbytes
 
 from test_framework.descriptors import descsum_create
 from test_framework.key import ECKey
@@ -32,7 +33,6 @@
     assert_greater_than,
     assert_raises_rpc_error,
     find_output,
-    random_bytes,
 )
 from test_framework.wallet_util import bytes_to_wif
 
@@ -598,10 +598,10 @@ def test_psbt_input_keys(psbt_input, keys):
 
         self.log.info("Test decoding PSBT with per-input preimage types")
         # note that the decodepsbt RPC doesn't check whether preimages and hashes match
-        hash_ripemd160, preimage_ripemd160 = random_bytes(20), random_bytes(50)
-        hash_sha256, preimage_sha256 = random_bytes(32), random_bytes(50)
-        hash_hash160, preimage_hash160 = random_bytes(20), random_bytes(50)
-        hash_hash256, preimage_hash256 = random_bytes(32), random_bytes(50)
+        hash_ripemd160, preimage_ripemd160 = randbytes(20), randbytes(50)
+        hash_sha256, preimage_sha256 = randbytes(32), randbytes(50)
+        hash_hash160, preimage_hash160 = randbytes(20), randbytes(50)
+        hash_hash256, preimage_hash256 = randbytes(32), randbytes(50)
 
         tx = CTransaction()
         tx.vin = [CTxIn(outpoint=COutPoint(hash=int('aa' * 32, 16), n=0), scriptSig=b""),

test/functional/test_framework/util.py

@@ -311,10 +311,6 @@ def sha256sum_file(filename):
             d = f.read(4096)
     return h.digest()
 
-# TODO: Remove and use random.randbytes(n) directly
-def random_bytes(n):
-    """Return a random bytes object of length n."""
-    return random.randbytes(n)
 
 # RPC/P2P connection constants and functions
 ############################################

test/functional/test_framework/v2_p2p.py

@@ -12,7 +12,6 @@
 from .crypto.hkdf import hkdf_sha256
 from .key import TaggedHash
 from .messages import MAGIC_BYTES
-from .util import random_bytes
 
 
 CHACHA20POLY1305_EXPANSION = 16
@@ -156,7 +155,7 @@ def generate_keypair_and_garbage(self, garbage_len=None):
         self.privkey_ours, self.ellswift_ours = ellswift_create()
         if garbage_len is None:
             garbage_len = random.randrange(MAX_GARBAGE_LEN + 1)
-        self.sent_garbage = random_bytes(garbage_len)
+        self.sent_garbage = random.randbytes(garbage_len)
         return self.ellswift_ours + self.sent_garbage
 
     def initiate_v2_handshake(self):