diff --git a/test/functional/abandonconflict.py b/test/functional/abandonconflict.py --- a/test/functional/abandonconflict.py +++ b/test/functional/abandonconflict.py @@ -18,7 +18,8 @@ class AbandonConflictTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 2 - self.extra_args = [["-minrelaytxfee=0.00001"], []] + self.extra_args = [["-minrelaytxfee=0.00001", + "-deprecatedrpc=signrawtransaction"], []] def run_test(self): def total_fees(*txids): @@ -159,7 +160,8 @@ # Reset to a higher relay fee so that we abandon a transaction self.stop_node(0) - self.start_node(0, extra_args=["-minrelaytxfee=0.0001"]) + self.start_node( + 0, extra_args=["-minrelaytxfee=0.0001", "-deprecatedrpc=signrawtransaction"]) assert_equal(len(self.nodes[0].getrawmempool()), 0) newbalance = self.nodes[0].getbalance() assert_equal(newbalance, balance - Decimal("24.9996")) diff --git a/test/functional/abc-checkdatasig-activation.py b/test/functional/abc-checkdatasig-activation.py --- a/test/functional/abc-checkdatasig-activation.py +++ b/test/functional/abc-checkdatasig-activation.py @@ -35,7 +35,9 @@ self.setup_clean_chain = True self.extra_args = [['-whitelist=127.0.0.1', "-magneticanomalyactivationtime=%d" % MAGNETIC_ANOMALY_START_TIME, - "-replayprotectionactivationtime=%d" % (2 * MAGNETIC_ANOMALY_START_TIME)]] + "-replayprotectionactivationtime=%d" % ( + 2 * MAGNETIC_ANOMALY_START_TIME), + "-deprecatedrpc=signrawtransaction"]] def create_checkdatasig_tx(self, count): node = self.nodes[0] diff --git a/test/functional/abc-magnetic-anomaly-mining.py b/test/functional/abc-magnetic-anomaly-mining.py --- a/test/functional/abc-magnetic-anomaly-mining.py +++ b/test/functional/abc-magnetic-anomaly-mining.py @@ -29,7 +29,9 @@ extra_arg = ['-spendzeroconfchange=0', '-whitelist=127.0.0.1', "-magneticanomalyactivationtime=%d" % self.mocktime, - "-replayprotectionactivationtime=%d" % (10 * self.mocktime)] + "-replayprotectionactivationtime=%d" % ( + 10 * self.mocktime), + "-deprecatedrpc=signrawtransaction"] self.extra_args = [extra_arg, extra_arg] def run_test(self): diff --git a/test/functional/bip65-cltv-p2p.py b/test/functional/bip65-cltv-p2p.py --- a/test/functional/bip65-cltv-p2p.py +++ b/test/functional/bip65-cltv-p2p.py @@ -67,7 +67,7 @@ def set_test_params(self): self.num_nodes = 1 self.extra_args = [ - ['-promiscuousmempoolflags=1', '-whitelist=127.0.0.1']] + ['-promiscuousmempoolflags=1', '-whitelist=127.0.0.1', "-deprecatedrpc=signrawtransaction"]] self.setup_clean_chain = True def run_test(self): diff --git a/test/functional/bip68-112-113-p2p.py b/test/functional/bip68-112-113-p2p.py --- a/test/functional/bip68-112-113-p2p.py +++ b/test/functional/bip68-112-113-p2p.py @@ -101,7 +101,8 @@ def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True - self.extra_args = [['-whitelist=127.0.0.1', '-blockversion=4']] + self.extra_args = [['-whitelist=127.0.0.1', + '-blockversion=4', "-deprecatedrpc=signrawtransaction"]] def run_test(self): test = TestManager(self, self.options.tmpdir) diff --git a/test/functional/bip68-sequence.py b/test/functional/bip68-sequence.py --- a/test/functional/bip68-sequence.py +++ b/test/functional/bip68-sequence.py @@ -26,8 +26,8 @@ class BIP68Test(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 2 - self.extra_args = [["-blockprioritypercentage=0", "-noparkdeepreorg", "-maxreorgdepth=-1"], - ["-blockprioritypercentage=0", "-acceptnonstdtxn=0", "-maxreorgdepth=-1"]] + self.extra_args = [["-blockprioritypercentage=0", "-noparkdeepreorg", "-maxreorgdepth=-1", "-deprecatedrpc=signrawtransaction"], + ["-blockprioritypercentage=0", "-acceptnonstdtxn=0", "-maxreorgdepth=-1", "-deprecatedrpc=signrawtransaction"]] def run_test(self): self.relayfee = self.nodes[0].getnetworkinfo()["relayfee"] diff --git a/test/functional/bipdersig-p2p.py b/test/functional/bipdersig-p2p.py --- a/test/functional/bipdersig-p2p.py +++ b/test/functional/bipdersig-p2p.py @@ -55,7 +55,7 @@ def set_test_params(self): self.num_nodes = 1 self.extra_args = [ - ['-promiscuousmempoolflags=1', '-whitelist=127.0.0.1']] + ['-promiscuousmempoolflags=1', '-whitelist=127.0.0.1', "-deprecatedrpc=signrawtransaction"]] self.setup_clean_chain = True def run_test(self): diff --git a/test/functional/dbcrash.py b/test/functional/dbcrash.py --- a/test/functional/dbcrash.py +++ b/test/functional/dbcrash.py @@ -63,7 +63,8 @@ self.node2_args = ["-dbcrashratio=24", "-dbcache=16"] + self.base_args # Node3 is a normal node with default args, except will mine full blocks - self.node3_args = ["-blockmaxsize=32000000"] + self.node3_args = ["-blockmaxsize=32000000", + "-deprecatedrpc=signrawtransaction"] self.extra_args = [self.node0_args, self.node1_args, self.node2_args, self.node3_args] diff --git a/test/functional/fundrawtransaction.py b/test/functional/fundrawtransaction.py --- a/test/functional/fundrawtransaction.py +++ b/test/functional/fundrawtransaction.py @@ -20,6 +20,10 @@ def set_test_params(self): self.num_nodes = 4 self.setup_clean_chain = True + self.extra_args = [["-deprecatedrpc=signrawtransaction"], + ["-deprecatedrpc=signrawtransaction"], + ["-deprecatedrpc=signrawtransaction"], + ["-deprecatedrpc=signrawtransaction"]] def setup_network(self, split=False): self.setup_nodes() diff --git a/test/functional/mempool_limit.py b/test/functional/mempool_limit.py --- a/test/functional/mempool_limit.py +++ b/test/functional/mempool_limit.py @@ -15,7 +15,8 @@ self.setup_clean_chain = True self.num_nodes = 1 - self.extra_args = [["-maxmempool=5", "-spendzeroconfchange=0"]] + self.extra_args = [ + ["-maxmempool=5", "-spendzeroconfchange=0", "-deprecatedrpc=signrawtransaction"]] def run_test(self): relayfee = self.nodes[0].getnetworkinfo()['relayfee'] diff --git a/test/functional/mempool_packages.py b/test/functional/mempool_packages.py --- a/test/functional/mempool_packages.py +++ b/test/functional/mempool_packages.py @@ -15,7 +15,7 @@ class MempoolPackagesTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 2 - self.extra_args = [["-maxorphantx=1000"], + self.extra_args = [["-maxorphantx=1000", "-deprecatedrpc=signrawtransaction"], ["-maxorphantx=1000", "-limitancestorcount=5"]] # Build a transaction that spends parent_txid:vout diff --git a/test/functional/mempool_reorg.py b/test/functional/mempool_reorg.py --- a/test/functional/mempool_reorg.py +++ b/test/functional/mempool_reorg.py @@ -17,7 +17,8 @@ class MempoolCoinbaseTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 2 - self.extra_args = [["-checkmempool"]] * 2 + self.extra_args = [ + ["-checkmempool", "-deprecatedrpc=signrawtransaction"]] * 2 alert_filename = None # Set by setup_network diff --git a/test/functional/mempool_resurrect_test.py b/test/functional/mempool_resurrect_test.py --- a/test/functional/mempool_resurrect_test.py +++ b/test/functional/mempool_resurrect_test.py @@ -17,7 +17,8 @@ class MempoolCoinbaseTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 - self.extra_args = [["-checkmempool"]] + self.extra_args = [ + ["-checkmempool", "-deprecatedrpc=signrawtransaction"]] def run_test(self): node0_address = self.nodes[0].getnewaddress() diff --git a/test/functional/mempool_spendcoinbase.py b/test/functional/mempool_spendcoinbase.py --- a/test/functional/mempool_spendcoinbase.py +++ b/test/functional/mempool_spendcoinbase.py @@ -22,7 +22,8 @@ class MempoolSpendCoinbaseTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 - self.extra_args = [["-checkmempool"]] + self.extra_args = [ + ["-checkmempool", "-deprecatedrpc=signrawtransaction"]] def run_test(self): chain_height = self.nodes[0].getblockcount() diff --git a/test/functional/merkle_blocks.py b/test/functional/merkle_blocks.py --- a/test/functional/merkle_blocks.py +++ b/test/functional/merkle_blocks.py @@ -16,7 +16,8 @@ self.num_nodes = 4 self.setup_clean_chain = True # Nodes 0/1 are "wallet" nodes, Nodes 2/3 are used for testing - self.extra_args = [[], [], [], ["-txindex"]] + self.extra_args = [["-deprecatedrpc=signrawtransaction"], + ["-deprecatedrpc=signrawtransaction"], [], ["-txindex"]] def setup_network(self): self.setup_nodes() diff --git a/test/functional/nulldummy.py b/test/functional/nulldummy.py --- a/test/functional/nulldummy.py +++ b/test/functional/nulldummy.py @@ -44,7 +44,8 @@ def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True - self.extra_args = [['-whitelist=127.0.0.1']] + self.extra_args = [['-whitelist=127.0.0.1', + "-deprecatedrpc=signrawtransaction"]] def run_test(self): self.address = self.nodes[0].getnewaddress() diff --git a/test/functional/prioritise_transaction.py b/test/functional/prioritise_transaction.py --- a/test/functional/prioritise_transaction.py +++ b/test/functional/prioritise_transaction.py @@ -19,7 +19,8 @@ def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 - self.extra_args = [["-printpriority=1"]] + self.extra_args = [["-printpriority=1", + "-deprecatedrpc=signrawtransaction"]] def run_test(self): self.relayfee = self.nodes[0].getnetworkinfo()['relayfee'] diff --git a/test/functional/rawtransactions.py b/test/functional/rawtransactions.py --- a/test/functional/rawtransactions.py +++ b/test/functional/rawtransactions.py @@ -23,6 +23,8 @@ def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 3 + self.extra_args = [ + [], ["-deprecatedrpc=signrawtransaction"], ["-deprecatedrpc=signrawtransaction"]] def setup_network(self, split=False): super().setup_network() diff --git a/test/functional/txn_doublespend.py b/test/functional/txn_doublespend.py --- a/test/functional/txn_doublespend.py +++ b/test/functional/txn_doublespend.py @@ -11,7 +11,8 @@ class TxnMallTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 4 - self.extra_args = [["-noparkdeepreorg"], ["-noparkdeepreorg"], [], []] + self.extra_args = [ + ["-noparkdeepreorg", "-deprecatedrpc=signrawtransaction"], ["-noparkdeepreorg"], [], []] def add_options(self, parser): parser.add_argument("--mineblock", dest="mine_block", default=False, action="store_true", diff --git a/test/functional/wallet.py b/test/functional/wallet.py --- a/test/functional/wallet.py +++ b/test/functional/wallet.py @@ -13,7 +13,7 @@ self.num_nodes = 4 self.setup_clean_chain = True self.extra_args = [ - ['-usehd={:d}'.format(i % 2 == 0)] for i in range(4)] + ['-usehd={:d}'.format(i % 2 == 0), "-deprecatedrpc=signrawtransaction"] for i in range(4)] def setup_network(self): self.add_nodes(4, self.extra_args) @@ -389,9 +389,12 @@ self.log.info("check " + m) self.stop_nodes() # set lower ancestor limit for later - self.start_node(0, [m, "-limitancestorcount=" + str(chainlimit)]) - self.start_node(1, [m, "-limitancestorcount=" + str(chainlimit)]) - self.start_node(2, [m, "-limitancestorcount=" + str(chainlimit)]) + self.start_node(0, [m, "-limitancestorcount=" + + str(chainlimit), "-deprecatedrpc=signrawtransaction"]) + self.start_node(1, [m, "-limitancestorcount=" + + str(chainlimit), "-deprecatedrpc=signrawtransaction"]) + self.start_node(2, [m, "-limitancestorcount=" + + str(chainlimit), "-deprecatedrpc=signrawtransaction"]) while m == '-reindex' and [block_count] * 3 != [self.nodes[i].getblockcount() for i in range(3)]: # reindex will leave rpc warm up "early"; Wait for it to finish time.sleep(0.1)