diff --git a/test/functional/mempool_expiry.py b/test/functional/mempool_expiry.py --- a/test/functional/mempool_expiry.py +++ b/test/functional/mempool_expiry.py @@ -22,18 +22,11 @@ class MempoolExpiryTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 - self.setup_clean_chain = True def test_transaction_expiry(self, timeout): """Tests that a transaction expires after the expiry timeout and its children are removed as well.""" node = self.nodes[0] - self.wallet = MiniWallet(node) - - # Add enough mature utxos to the wallet so that all txs spend confirmed - # coins. - self.generate(self.wallet, 4) - self.generate(node, 100) # Send a parent transaction that will expire. parent_txid = self.wallet.send_self_transfer(from_node=node)["txid"] @@ -110,6 +103,8 @@ assert_equal(half_expiry_time, node.getmempoolentry(independent_txid)["time"]) def run_test(self): + self.wallet = MiniWallet(self.nodes[0]) + self.log.info( f"Test default mempool expiry timeout of {DEFAULT_MEMPOOL_EXPIRY_HOURS} hours." ) diff --git a/test/functional/mempool_resurrect.py b/test/functional/mempool_resurrect.py --- a/test/functional/mempool_resurrect.py +++ b/test/functional/mempool_resurrect.py @@ -11,17 +11,11 @@ class MempoolCoinbaseTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 - self.setup_clean_chain = True def run_test(self): node = self.nodes[0] wallet = MiniWallet(node) - # Add enough mature utxos to the wallet so that all txs spend confirmed - # coins - self.generate(wallet, 3) - self.generate(node, 100) - # Spend block 1/2/3's coinbase transactions # Mine a block # Create three more transactions, spending the spends diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -43,7 +43,6 @@ class NetTest(BitcoinTestFramework): def set_test_params(self): - self.setup_clean_chain = True self.num_nodes = 2 self.extra_args = [ [ @@ -60,8 +59,6 @@ self.supports_cli = False def run_test(self): - # Get out of IBD for the minfeefilter and getpeerinfo tests. - self.generate(self.nodes[0], 101) # Connect nodes both ways. self.connect_nodes(0, 1) self.connect_nodes(1, 0) diff --git a/test/functional/rpc_rawtransaction.py b/test/functional/rpc_rawtransaction.py --- a/test/functional/rpc_rawtransaction.py +++ b/test/functional/rpc_rawtransaction.py @@ -46,7 +46,6 @@ # Create one-input, one-output, no-fee transaction: class RawTransactionsTest(BitcoinTestFramework): def set_test_params(self): - self.setup_clean_chain = True self.num_nodes = 3 self.extra_args = [["-txindex"], ["-txindex"], ["-txindex"]] # whitelist all peers to speed up tx relay / mempool sync @@ -63,15 +62,6 @@ self.connect_nodes(0, 2) def run_test(self): - self.log.info("prepare some coins for multiple *rawtransaction commands") - self.generate(self.nodes[2], 1) - self.generate(self.nodes[0], 101) - self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 1500000) - self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 1000000) - self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 5000000) - self.sync_all() - self.generate(self.nodes[0], 5) - self.log.info( "Test getrawtransaction on genesis block coinbase returns an error" ) diff --git a/test/functional/rpc_txoutproof.py b/test/functional/rpc_txoutproof.py --- a/test/functional/rpc_txoutproof.py +++ b/test/functional/rpc_txoutproof.py @@ -12,7 +12,6 @@ class MerkleBlockTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 2 - self.setup_clean_chain = True self.extra_args = [ [], ["-txindex"], @@ -20,13 +19,9 @@ def run_test(self): miniwallet = MiniWallet(self.nodes[0]) - # Add enough mature utxos to the wallet, so that all txs spend - # confirmed coins - self.generate(miniwallet, 5) - self.generate(self.nodes[0], 100) chain_height = self.nodes[1].getblockcount() - assert_equal(chain_height, 105) + assert_equal(chain_height, 200) txid1 = miniwallet.send_self_transfer(from_node=self.nodes[0])["txid"] txid2 = miniwallet.send_self_transfer(from_node=self.nodes[0])["txid"]