Skip to content

Commit

Permalink
[tests] Set -deprecatedrpc=accounts in tests
Browse files Browse the repository at this point in the history
Future commits will deprecate the accounts RPC methods, arguments and
return objects. Set the -deprecatedrpc=accounts switch now so tests
don't break in intermediate commits.
  • Loading branch information
jnewbery committed Apr 16, 2018
1 parent 4e671f0 commit 3db1ba0
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 8 deletions.
11 changes: 6 additions & 5 deletions test/functional/wallet_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ class WalletTest(BitcoinTestFramework):
def set_test_params(self):
self.num_nodes = 4
self.setup_clean_chain = True
self.extra_args = [['-deprecatedrpc=accounts']] * 4

def setup_network(self):
self.add_nodes(4)
self.add_nodes(4, self.extra_args)
self.start_node(0)
self.start_node(1)
self.start_node(2)
Expand Down Expand Up @@ -376,9 +377,9 @@ def run_test(self):
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, "-deprecatedrpc=accounts", "-limitancestorcount="+str(chainlimit)])
self.start_node(1, [m, "-deprecatedrpc=accounts", "-limitancestorcount="+str(chainlimit)])
self.start_node(2, [m, "-deprecatedrpc=accounts", "-limitancestorcount="+str(chainlimit)])
if m == '-reindex':
# reindex will leave rpc warm up "early"; Wait for it to finish
wait_until(lambda: [block_count] * 3 == [self.nodes[i].getblockcount() for i in range(3)])
Expand Down Expand Up @@ -426,7 +427,7 @@ def run_test(self):
# Try with walletrejectlongchains
# Double chain limit but require combining inputs, so we pass SelectCoinsMinConf
self.stop_node(0)
self.start_node(0, extra_args=["-walletrejectlongchains", "-limitancestorcount="+str(2*chainlimit)])
self.start_node(0, extra_args=["-deprecatedrpc=accounts", "-walletrejectlongchains", "-limitancestorcount="+str(2*chainlimit)])

# wait for loadmempool
timeout = 10
Expand Down
2 changes: 1 addition & 1 deletion test/functional/wallet_import_rescan.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def set_test_params(self):
self.num_nodes = 2 + len(IMPORT_NODES)

def setup_network(self):
extra_args = [["-addresstype=legacy"] for _ in range(self.num_nodes)]
extra_args = [["-addresstype=legacy", '-deprecatedrpc=accounts'] for _ in range(self.num_nodes)]
for i, import_node in enumerate(IMPORT_NODES, 2):
if import_node.prune:
extra_args[i] += ["-prune=1"]
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_importprunedfunds.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 2
self.extra_args = [['-deprecatedrpc=accounts']] * 2

def run_test(self):
self.log.info("Mining blocks...")
Expand Down
2 changes: 1 addition & 1 deletion test/functional/wallet_keypool_topup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class KeypoolRestoreTest(BitcoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 2
self.extra_args = [[], ['-keypool=100', '-keypoolmin=20']]
self.extra_args = [['-deprecatedrpc=accounts'], ['-deprecatedrpc=accounts', '-keypool=100', '-keypoolmin=20']]

def run_test(self):
wallet_path = os.path.join(self.nodes[1].datadir, "regtest", "wallets", "wallet.dat")
Expand Down
2 changes: 1 addition & 1 deletion test/functional/wallet_labels.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class WalletLabelsTest(BitcoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 1
self.extra_args = [[]]
self.extra_args = [['-deprecatedrpc=accounts']]

def run_test(self):
node = self.nodes[0]
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_listreceivedby.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
class ReceivedByTest(BitcoinTestFramework):
def set_test_params(self):
self.num_nodes = 2
self.extra_args = [['-deprecatedrpc=accounts']] * 2

def run_test(self):
# Generate block to get out of IBD
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_listsinceblock.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class ListSinceBlockTest (BitcoinTestFramework):
def set_test_params(self):
self.num_nodes = 4
self.setup_clean_chain = True
self.extra_args = [['-deprecatedrpc=accounts']] * 4

def run_test(self):
self.nodes[2].generate(101)
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_listtransactions.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def txFromHex(hexstring):
class ListTransactionsTest(BitcoinTestFramework):
def set_test_params(self):
self.num_nodes = 2
self.extra_args = [['-deprecatedrpc=accounts']] * 2
self.enable_mocktime()

def run_test(self):
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_txn_clone.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
class TxnMallTest(BitcoinTestFramework):
def set_test_params(self):
self.num_nodes = 4
self.extra_args = [['-deprecatedrpc=accounts']] * 4

def add_options(self, parser):
parser.add_option("--mineblock", dest="mine_block", default=False, action="store_true",
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_txn_doublespend.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
class TxnMallTest(BitcoinTestFramework):
def set_test_params(self):
self.num_nodes = 4
self.extra_args = [['-deprecatedrpc=accounts']] * 4

def add_options(self, parser):
parser.add_option("--mineblock", dest="mine_block", default=False, action="store_true",
Expand Down

0 comments on commit 3db1ba0

Please sign in to comment.