merge bitcoin#25356: Remove MiniWallet mempool_valid option

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, mempool_valid=False)['tx']
+            tx = miniwallet.create_self_transfer(from_node=node, fee_rate=0)['tx']
             for txout in txouts:
                 tx.vout.append(txout)
             tx.vout[0].nValue -= int(fee * COIN)
@@ -85,7 +85,7 @@ def run_test(self):
 
         # Deliberately try to create a tx with a fee less than the minimum mempool fee to assert that it does not get added to the mempool
         self.log.info('Create a mempool tx that will not pass mempoolminfee')
-        assert_raises_rpc_error(-26, "mempool min fee not met", miniwallet.send_self_transfer, from_node=node, fee_rate=relayfee, mempool_valid=False)
+        assert_raises_rpc_error(-26, "mempool min fee not met", miniwallet.send_self_transfer, from_node=node, fee_rate=relayfee)
 
         self.log.info('Test passing a value below the minimum (5 MB) to -maxmempool throws an error')
         self.stop_node(0)

test/functional/mempool_reorg.py

@@ -53,8 +53,7 @@ def run_test(self):
         utxo = wallet.get_utxo(txid=coinbase_txids[0])
         timelock_tx = wallet.create_self_transfer(
             utxo_to_spend=utxo,
-            mempool_valid=False,
-            locktime=self.nodes[0].getblockcount() + 2
+            locktime=self.nodes[0].getblockcount() + 2,
         )['hex']
 
         self.log.info("Check that the time-locked transaction is too immature to spend")

test/functional/mempool_spend_coinbase.py

@@ -40,7 +40,7 @@ def run_test(self):
         spend_mature_id = wallet.send_self_transfer(from_node=self.nodes[0], utxo_to_spend=utxo_mature)["txid"]
 
         # other coinbase should be too immature to spend
-        immature_tx = wallet.create_self_transfer(utxo_to_spend=utxo_immature, mempool_valid=False)
+        immature_tx = wallet.create_self_transfer(utxo_to_spend=utxo_immature)
         assert_raises_rpc_error(-26,
                                 "bad-txns-premature-spend-of-coinbase",
                                 lambda: self.nodes[0].sendrawtransaction(immature_tx['hex']))

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, mempool_valid=False)['tx']
+        tx = mini_wallet.create_self_transfer(from_node=node, 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

@@ -187,7 +187,7 @@ 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, mempool_valid=False)['tx']
+        tx = self.create_self_transfer(from_node=from_node, 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
@@ -224,7 +224,7 @@ def create_self_transfer_multi(
         # create simple tx template (1 input, 1 output)
         tx = self.create_self_transfer(
             fee_rate=0, from_node=from_node,
-            utxo_to_spend=utxos_to_spend[0], sequence=sequence, mempool_valid=False)['tx']
+            utxo_to_spend=utxos_to_spend[0], sequence=sequence)["tx"]
 
         # duplicate inputs, witnesses and outputs
         tx.vin = [deepcopy(tx.vin[0]) for _ in range(len(utxos_to_spend))]
@@ -241,9 +241,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, mempool_valid=True, 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.
-           Checking mempool validity via the testmempoolaccept RPC can be skipped by setting mempool_valid to False."""
+    def create_self_transfer(self, *, fee_rate=Decimal("0.003"), from_node=None, 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):
@@ -269,11 +268,7 @@ def create_self_transfer(self, *, fee_rate=Decimal("0.003"), from_node=None, utx
             assert False
         tx_hex = tx.serialize().hex()
 
-        if mempool_valid:
-            tx_info = from_node.testmempoolaccept([tx_hex])[0]
-            assert_equal(tx_info['allowed'], True)
-            assert_equal(len(tx_hex) // 2, vsize) # 1 byte = 2 character
-            assert_equal(tx_info['fees']['base'], utxo_to_spend['value'] - Decimal(send_value) / COIN)
+        assert_equal(tx.get_vsize(), vsize)
 
         return {'txid': tx.rehash(), 'hex': tx_hex, 'tx': tx}