merge bitcoin#25435: Remove from_node from create_self_transfer* MiniWallet helpers

Author: kwvg

test/functional/mempool_limit.py

@@ -31,7 +31,7 @@ def set_test_params(self):
 
     def send_large_txs(self, node, miniwallet, txouts, fee, tx_batch_size):
         for _ in range(tx_batch_size):
-            tx = miniwallet.create_self_transfer(from_node=node, fee_rate=0)['tx']
+            tx = miniwallet.create_self_transfer(fee_rate=0)['tx']
             for txout in txouts:
                 tx.vout.append(txout)
             tx.vout[0].nValue -= int(fee * COIN)

test/functional/mempool_unbroadcast.py

@@ -40,7 +40,7 @@ def test_broadcast(self):
             wallet_tx_hsh = node.sendtoaddress(addr, 0.0001)
 
         # generate a txn using sendrawtransaction
-        txFS = self.wallet.create_self_transfer(from_node=node)
+        txFS = self.wallet.create_self_transfer()
         rpc_tx_hsh = node.sendrawtransaction(txFS["hex"])
 
         # check transactions are in unbroadcast using rpc

test/functional/test_framework/util.py

@@ -642,7 +642,7 @@ def mine_large_block(test_framework, mini_wallet, node):
     from .messages import COIN
     fee = 100 * int(node.getnetworkinfo()["relayfee"] * COIN)
     for _ in range(14):
-        tx = mini_wallet.create_self_transfer(from_node=node, fee_rate=0)['tx']
+        tx = mini_wallet.create_self_transfer(fee_rate=0)['tx']
         tx.vout[0].nValue -= fee
         tx.vout.extend(txouts)
         mini_wallet.sendrawtransaction(from_node=node, tx_hex=tx.serialize().hex())

test/functional/test_framework/wallet.py

@@ -169,10 +169,10 @@ def get_utxo(self, *, txid: str = '', vout: Optional[int] = None, mark_as_spent=
         else:
             return self._utxos[index]
 
-    def send_self_transfer(self, **kwargs):
+    def send_self_transfer(self, *, from_node, **kwargs):
         """Create and send a tx with the specified fee_rate. Fee may be exact or at most one satoshi higher than needed."""
         tx = self.create_self_transfer(**kwargs)
-        self.sendrawtransaction(from_node=kwargs['from_node'], tx_hex=tx['hex'])
+        self.sendrawtransaction(from_node=from_node, tx_hex=tx['hex'])
         return tx
 
     def send_to(self, *, from_node, scriptPubKey, amount, fee=1000):
@@ -187,14 +187,14 @@ def send_to(self, *, from_node, scriptPubKey, amount, fee=1000):
 
         Returns a tuple (txid, n) referring to the created external utxo outpoint.
         """
-        tx = self.create_self_transfer(from_node=from_node, fee_rate=0)["tx"]
+        tx = self.create_self_transfer(fee_rate=0)["tx"]
         assert_greater_than_or_equal(tx.vout[0].nValue, amount + fee)
         tx.vout[0].nValue -= (amount + fee)           # change output -> MiniWallet
         tx.vout.append(CTxOut(amount, scriptPubKey))  # arbitrary output -> to be returned
         txid = self.sendrawtransaction(from_node=from_node, tx_hex=tx.serialize().hex())
         return txid, 1
 
-    def send_self_transfer_multi(self, **kwargs):
+    def send_self_transfer_multi(self, *, from_node, **kwargs):
         """
         Create and send a transaction that spends the given UTXOs and creates a
         certain number of outputs with equal amounts.
@@ -206,24 +206,26 @@ def send_self_transfer_multi(self, **kwargs):
             - list of newly created UTXOs, ordered by vout index
         """
         tx = self.create_self_transfer_multi(**kwargs)
-        txid = self.sendrawtransaction(from_node=kwargs['from_node'], tx_hex=tx.serialize().hex())
+        txid = self.sendrawtransaction(from_node=from_node, tx_hex=tx.serialize().hex())
         return {'new_utxos': [self.get_utxo(txid=txid, vout=vout) for vout in range(len(tx.vout))],
                 'txid': txid, 'hex': tx.serialize().hex(), 'tx': tx}
 
     def create_self_transfer_multi(
-            self, *, from_node,
-            utxos_to_spend: Optional[List[dict]] = None,
-            num_outputs=1,
-            sequence=0,
-            fee_per_output=1000):
+        self,
+        *,
+        utxos_to_spend: Optional[List[dict]] = None,
+        num_outputs=1,
+        sequence=0,
+        fee_per_output=1000,
+    ):
         """
         Create and return a transaction that spends the given UTXOs and creates a
         certain number of outputs with equal amounts.
         """
         utxos_to_spend = utxos_to_spend or [self.get_utxo()]
         # create simple tx template (1 input, 1 output)
         tx = self.create_self_transfer(
-            fee_rate=0, from_node=from_node,
+            fee_rate=0,
             utxo_to_spend=utxos_to_spend[0], sequence=sequence)["tx"]
 
         # duplicate inputs, witnesses and outputs
@@ -241,9 +243,8 @@ def create_self_transfer_multi(
             o.nValue = outputs_value_total // num_outputs
         return tx
 
-    def create_self_transfer(self, *, fee_rate=Decimal("0.003"), from_node=None, utxo_to_spend=None, locktime=0, sequence=0):
+    def create_self_transfer(self, *, fee_rate=Decimal("0.003"), utxo_to_spend=None, locktime=0, sequence=0):
         """Create and return a tx with the specified fee_rate. Fee may be exact or at most one satoshi higher than needed."""
-        from_node = from_node or self._test_node
         utxo_to_spend = utxo_to_spend or self.get_utxo()
         if self._mode in (MiniWalletMode.RAW_OP_TRUE, MiniWalletMode.ADDRESS_OP_TRUE):
             vsize = Decimal(85)  # anyone-can-spend