test: Use MiniWalet in p2p_feefilter

1 files changed, 10 insertions, 12 deletions

diff --git a/test/functional/p2p_feefilter.py b/test/functional/p2p_feefilter.py
index fc77af2f10..b5f4df299a 100755
--- a/test/functional/p2p_feefilter.py
+++ b/test/functional/p2p_feefilter.py
@@ -10,6 +10,7 @@ from test_framework.messages import MSG_TX, MSG_WTX, msg_feefilter
 from test_framework.mininode import mininode_lock, P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
+from test_framework.wallet import MiniWallet
 
 
 class FeefilterConn(P2PInterface):
@@ -57,9 +58,6 @@ class FeeFilterTest(BitcoinTestFramework):
             "-whitelist=noban@127.0.0.1",
         ]] * self.num_nodes
 
-    def skip_test_if_missing_module(self):
-        self.skip_if_no_wallet()
-
     def run_test(self):
         self.test_feefilter_forcerelay()
         self.test_feefilter()
@@ -79,12 +77,15 @@ class FeeFilterTest(BitcoinTestFramework):
     def test_feefilter(self):
         node1 = self.nodes[1]
         node0 = self.nodes[0]
+        miniwallet = MiniWallet(node1)
+        # Add enough mature utxos to the wallet, so that all txs spend confirmed coins
+        miniwallet.generate(5)
+        node1.generate(100)
 
         conn = self.nodes[0].add_p2p_connection(TestP2PConn())
 
         self.log.info("Test txs paying 0.2 sat/byte are received by test connection")
-        node1.settxfee(Decimal("0.00000200"))
-        txids = [node1.sendtoaddress(node1.getnewaddress(), 1) for _ in range(3)]
+        txids = [miniwallet.send_self_transfer(fee_rate=Decimal('0.00000200'), from_node=node1)['wtxid'] for _ in range(3)]
         conn.wait_for_invs_to_match(txids)
         conn.clear_invs()
 
@@ -92,14 +93,12 @@ class FeeFilterTest(BitcoinTestFramework):
         conn.send_and_ping(msg_feefilter(150))
 
         self.log.info("Test txs paying 0.15 sat/byte are received by test connection")
-        node1.settxfee(Decimal("0.00000150"))
-        txids = [node1.sendtoaddress(node1.getnewaddress(), 1) for _ in range(3)]
+        txids = [miniwallet.send_self_transfer(fee_rate=Decimal('0.00000150'), from_node=node1)['wtxid'] for _ in range(3)]
         conn.wait_for_invs_to_match(txids)
         conn.clear_invs()
 
         self.log.info("Test txs paying 0.1 sat/byte are no longer received by test connection")
-        node1.settxfee(Decimal("0.00000100"))
-        [node1.sendtoaddress(node1.getnewaddress(), 1) for _ in range(3)]
+        txids = [miniwallet.send_self_transfer(fee_rate=Decimal('0.00000100'), from_node=node1)['wtxid'] for _ in range(3)]
         self.sync_mempools()  # must be sure node 0 has received all txs
 
         # Send one transaction from node0 that should be received, so that we
@@ -109,14 +108,13 @@ class FeeFilterTest(BitcoinTestFramework):
         # to 35 entries in an inv, which means that when this next transaction
         # is eligible for relay, the prior transactions from node1 are eligible
         # as well.
-        node0.settxfee(Decimal("0.00020000"))
-        txids = [node0.sendtoaddress(node0.getnewaddress(), 1)]
+        txids = [miniwallet.send_self_transfer(fee_rate=Decimal('0.00020000'), from_node=node0)['wtxid'] for _ in range(3)]
         conn.wait_for_invs_to_match(txids)
         conn.clear_invs()
 
         self.log.info("Remove fee filter and check txs are received again")
         conn.send_and_ping(msg_feefilter(0))
-        txids = [node1.sendtoaddress(node1.getnewaddress(), 1) for _ in range(3)]
+        txids = [miniwallet.send_self_transfer(fee_rate=Decimal('0.00020000'), from_node=node1)['wtxid'] for _ in range(3)]
         conn.wait_for_invs_to_match(txids)
         conn.clear_invs()