Replace setup_clean_chain with cache_behavior in rpc test init.

qa/rpc-tests/addressindex.py

@@ -46,7 +46,7 @@ class AddressIndexTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 4
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_network(self):
         # -insightexplorer causes addressindex to be enabled (fAddressIndex = true)

qa/rpc-tests/blockchain.py

@@ -28,7 +28,6 @@ class BlockchainTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = False
         self.num_nodes = 2
 
     def setup_network(self, split=False):

qa/rpc-tests/coinbase_funding_streams.py

@@ -22,7 +22,7 @@ class CoinbaseFundingStreamsTest (BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 2
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def start_node_with(self, index, extra_args=[]):
         args = [

qa/rpc-tests/decodescript.py

@@ -16,7 +16,7 @@ class DecodeScriptTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 1
 
     def setup_network(self, split=False):

qa/rpc-tests/disablewallet.py

@@ -16,7 +16,7 @@ class DisableWalletTest (BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 1
 
     def setup_network(self, split=False):

qa/rpc-tests/feature_logging.py

@@ -14,7 +14,7 @@ from test_framework.test_framework import BitcoinTestFramework
 class LoggingTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def run_test(self):
         # test default log file name

qa/rpc-tests/feature_walletfile.py

@@ -14,7 +14,7 @@ from test_framework.test_framework import BitcoinTestFramework
 class WalletFileTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def run_test(self):
         # test default wallet location

qa/rpc-tests/feature_zip221.py

@@ -30,7 +30,7 @@ class Zip221Test(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 4
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_nodes(self):
         return start_nodes(self.num_nodes, self.options.tmpdir, extra_args=[[

qa/rpc-tests/forknotify.py

@@ -18,7 +18,6 @@ class ForkNotifyTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 2
-        self.setup_clean_chain = False
 
     alert_filename = None  # Set by setup_network
 

qa/rpc-tests/framework.py

@@ -16,7 +16,7 @@ class FrameworkTest (BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 2
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def start_node_with(self, index, extra_args=[]):
         args = []

qa/rpc-tests/fundrawtransaction.py

@@ -17,7 +17,7 @@ class RawTransactionsTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 4
 
     def setup_network(self, split=False):

qa/rpc-tests/getblocktemplate_longpoll.py

@@ -50,11 +50,6 @@ class GetBlockTemplateLPTest(BitcoinTestFramework):
     Test longpolling with getblocktemplate.
     '''
 
-    def __init__(self):
-        super().__init__()
-        self.num_nodes = 4
-        self.setup_clean_chain = False
-
     def run_test(self):
         print("Warning: this test will take about 70 seconds in the best case. Be patient.")
         self.nodes[0].generate(10)

qa/rpc-tests/getblocktemplate_proposals.py

@@ -99,7 +99,6 @@ class GetBlockTemplateProposalTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 2
-        self.setup_clean_chain = False
 
     def setup_network(self):
         self.nodes = self.setup_nodes()

qa/rpc-tests/getchaintips.py

@@ -13,10 +13,6 @@ from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
 
 class GetChainTipsTest (BitcoinTestFramework):
-    def __init__(self):
-        super().__init__()
-        self.num_nodes = 4
-        self.setup_clean_chain = False
 
     def run_test (self):
 

qa/rpc-tests/getmininginfo.py

@@ -15,7 +15,7 @@ class GetMiningInfoTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 1
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_network(self, split=False):
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)

qa/rpc-tests/getrawtransaction_insight.py

@@ -22,7 +22,7 @@ class GetrawtransactionTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 3
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_network(self):
         # -insightexplorer causes spentindex to be enabled (fSpentIndex = true)

qa/rpc-tests/httpbasics.py

@@ -18,7 +18,6 @@ class HTTPBasicsTest (BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 3
-        self.setup_clean_chain = False
 
     def setup_network(self):
         self.nodes = self.setup_nodes()

qa/rpc-tests/invalidateblock.py

@@ -17,7 +17,7 @@ import time
 class InvalidateTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 3
 
     def setup_network(self):

qa/rpc-tests/key_import_export.py

@@ -19,7 +19,7 @@ class KeyImportExportTest (BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 4
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_network(self, split=False):
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir )

qa/rpc-tests/keypool.py

@@ -87,7 +87,6 @@ class KeyPoolTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = False
         self.num_nodes = 1
 
     def setup_network(self):

qa/rpc-tests/listtransactions.py

@@ -32,10 +32,6 @@ def check_array_result(object_array, to_match, expected):
         raise AssertionError("No objects matched %s"%(str(to_match)))
 
 class ListTransactionsTest(BitcoinTestFramework):
-    def __init__(self):
-        super().__init__()
-        self.num_nodes = 4
-        self.setup_clean_chain = False
 
     def run_test(self):
         # Simple send, 0 to 1:

qa/rpc-tests/maxblocksinflight.py

@@ -88,7 +88,7 @@ class MaxBlocksInFlightTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 1
 
     def setup_network(self):

qa/rpc-tests/mempool_limit.py

@@ -40,7 +40,7 @@ class MempoolLimit(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 4
 
     def run_test(self):

qa/rpc-tests/mempool_nu_activation.py

@@ -26,7 +26,7 @@ class MempoolUpgradeActivationTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 2
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_network(self):
         args = ["-checkmempool", "-debug=mempool", "-blockmaxsize=4000",

qa/rpc-tests/mempool_reorg.py

@@ -19,7 +19,6 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 2
-        self.setup_clean_chain = False
 
     alert_filename = None  # Set by setup_network
 

qa/rpc-tests/mempool_resurrect_test.py

@@ -21,7 +21,6 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 1
-        self.setup_clean_chain = False
 
     def setup_network(self):
         # Just need one node for this test

qa/rpc-tests/mempool_spendcoinbase.py

@@ -26,7 +26,6 @@ class MempoolSpendCoinbaseTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 1
-        self.setup_clean_chain = False
 
     def setup_network(self):
         # Just need one node for this test

qa/rpc-tests/merkle_blocks.py

@@ -19,7 +19,7 @@ class MerkleBlockTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 4
 
     def setup_network(self):

qa/rpc-tests/mining_shielded_coinbase.py

@@ -26,7 +26,7 @@ class ShieldCoinbaseTest (BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 4
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def start_node_with(self, index, extra_args=[]):
         args = [

qa/rpc-tests/multi_rpc.py

@@ -19,7 +19,6 @@ class HTTPBasicsTest (BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = False
         self.num_nodes = 1
 
     def setup_chain(self):

qa/rpc-tests/nodehandling.py

@@ -17,11 +17,6 @@ import urllib.parse
 
 class NodeHandlingTest (BitcoinTestFramework):
 
-    def __init__(self):
-        super().__init__()
-        self.num_nodes = 4
-        self.setup_clean_chain = False
-
     def run_test(self):
         ###########################
         # setban/listbanned tests #

qa/rpc-tests/nuparams.py

@@ -27,7 +27,7 @@ class NuparamsTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 1
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_network(self, split=False):
         args = [[

qa/rpc-tests/orchard_reorg.py

@@ -28,7 +28,7 @@ class OrchardReorgTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 4
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_nodes(self):
         return start_nodes(self.num_nodes, self.options.tmpdir, extra_args=[[

qa/rpc-tests/p2p-acceptblock.py

@@ -120,7 +120,7 @@ class AcceptBlockTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 2
 
     def setup_network(self):

qa/rpc-tests/p2p_txexpiringsoon.py

@@ -17,7 +17,7 @@ class TxExpiringSoonTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 3
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_network(self):
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)

qa/rpc-tests/p2p_txexpiry_dos.py

@@ -17,7 +17,7 @@ class TxExpiryDoSTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 1
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_network(self):
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)

qa/rpc-tests/proxy_test.py

@@ -38,8 +38,6 @@ addnode connect to generic DNS name
 class ProxyTest(BitcoinTestFramework):        
     def __init__(self):
         super().__init__()
-        self.num_nodes = 4
-        self.setup_clean_chain = False
 
         self.have_ipv6 = test_ipv6_local()
         # Create two proxies on different ports

qa/rpc-tests/pruning.py

@@ -27,7 +27,7 @@ class PruneTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 3
 
         self.utxo = []

qa/rpc-tests/rawtransactions.py

@@ -21,7 +21,7 @@ class RawTransactionsTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 3
 
     def setup_network(self, split=False):

qa/rpc-tests/receivedby.py

@@ -54,11 +54,6 @@ def check_array_result(object_array, to_match, expected, should_not_find = False
 
 class ReceivedByTest(BitcoinTestFramework):
 
-    def __init__(self):
-        super().__init__()
-        self.num_nodes = 4
-        self.setup_clean_chain = False
-
     def run_test(self):
         '''
         listreceivedbyaddress Test

qa/rpc-tests/reindex.py

@@ -17,7 +17,7 @@ class ReindexTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 1
 
     def setup_network(self):

qa/rpc-tests/rest.py

@@ -53,7 +53,7 @@ class RESTTest (BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 3
 
     def setup_network(self, split=False):

qa/rpc-tests/rewind_index.py

@@ -18,7 +18,7 @@ class RewindBlockIndexTest (BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 3
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_network(self, split=False):
         # Node 0 - Overwinter, then Sprout, then Overwinter again

qa/rpc-tests/rpcbind_test.py

@@ -29,7 +29,7 @@ class RPCBindTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 1
 
     def setup_network(self):

qa/rpc-tests/sapling_rewind_check.py

@@ -45,7 +45,7 @@ class SaplingRewindTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 3
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     # This mirrors how the network was setup in the bash test
     def setup_network(self, split=False):

qa/rpc-tests/shorter_block_times.py

@@ -17,7 +17,7 @@ class ShorterBlockTimes(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 4
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_nodes(self):
         return start_nodes(self.num_nodes, self.options.tmpdir, [[

qa/rpc-tests/signrawtransactions.py

@@ -13,7 +13,7 @@ class SignRawTransactionsTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 1
 
     def setup_network(self, split=False):

qa/rpc-tests/smartfees.py

@@ -146,7 +146,6 @@ class EstimateFeeTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 3
-        self.setup_clean_chain = False
 
     def setup_network(self):
         '''

qa/rpc-tests/threeofthreerestore.py

@@ -10,7 +10,7 @@ class ThreeOfThreeRestoreTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 4
 
     def setup_network(self, split=False):

qa/rpc-tests/turnstile.py

@@ -48,7 +48,7 @@ class TurnstileTest (BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 3
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_network(self, split=False):
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)

qa/rpc-tests/txn_doublespend.py

@@ -15,11 +15,6 @@ from test_framework.util import assert_equal, connect_nodes, \
 
 class TxnMallTest(BitcoinTestFramework):
 
-    def __init__(self):
-        super().__init__()
-        self.num_nodes = 4
-        self.setup_clean_chain = False
-
     def add_options(self, parser):
         parser.add_option("--mineblock", dest="mine_block", default=False, action="store_true",
                           help="Test double-spend of 1-confirmed transaction")

qa/rpc-tests/wallet.py

@@ -15,7 +15,7 @@ class WalletTest (BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 4
 
     def setup_network(self, split=False):

qa/rpc-tests/wallet_addresses.py

@@ -20,7 +20,7 @@ class WalletAddressesTest(BitcoinTestFramework):
         super().__init__()
         # need 2 nodes to import addresses
         self.num_nodes = 2
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_network(self):
         self.nodes = start_nodes(

qa/rpc-tests/wallet_listreceived.py

@@ -30,7 +30,7 @@ class ListReceivedTest (BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 3
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_network(self):
         self.nodes = start_nodes(

qa/rpc-tests/wallet_overwintertx.py

@@ -22,7 +22,7 @@ class WalletOverwinterTxTest (BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 4
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
 
     def setup_network(self, split=False):
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, extra_args=[[

qa/rpc-tests/walletbackup.py

@@ -53,7 +53,7 @@ class WalletBackupTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 4
 
     # This mirrors how the network was setup in the bash test

qa/rpc-tests/zapwallettxes.py

@@ -14,7 +14,7 @@ class ZapWalletTXesTest (BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = True
+        self.cache_behavior = 'clean'
         self.num_nodes = 3
 
     def setup_network(self, split=False):