Allow multiwallet.py to be used with --usecli
Add test coverage for bitcoin-cli multiwallet calls.
This commit is contained in:
parent
f6ade9ce1a
commit
a14dbff39e
2 changed files with 28 additions and 21 deletions
|
@ -17,9 +17,16 @@ class MultiWalletTest(BitcoinTestFramework):
|
||||||
self.setup_clean_chain = True
|
self.setup_clean_chain = True
|
||||||
self.num_nodes = 1
|
self.num_nodes = 1
|
||||||
self.extra_args = [['-wallet=w1', '-wallet=w2', '-wallet=w3', '-wallet=w']]
|
self.extra_args = [['-wallet=w1', '-wallet=w2', '-wallet=w3', '-wallet=w']]
|
||||||
|
self.supports_cli = True
|
||||||
|
|
||||||
def run_test(self):
|
def run_test(self):
|
||||||
assert_equal(set(self.nodes[0].listwallets()), {"w1", "w2", "w3", "w"})
|
node = self.nodes[0]
|
||||||
|
|
||||||
|
data_dir = lambda *p: os.path.join(node.datadir, 'regtest', *p)
|
||||||
|
wallet_dir = lambda *p: data_dir('wallets', *p)
|
||||||
|
wallet = lambda name: node.get_wallet_rpc(name)
|
||||||
|
|
||||||
|
assert_equal(set(node.listwallets()), {"w1", "w2", "w3", "w"})
|
||||||
|
|
||||||
self.stop_node(0)
|
self.stop_node(0)
|
||||||
|
|
||||||
|
@ -27,39 +34,38 @@ class MultiWalletTest(BitcoinTestFramework):
|
||||||
self.assert_start_raises_init_error(0, ['-wallet=w1', '-wallet=w1'], 'Error loading wallet w1. Duplicate -wallet filename specified.')
|
self.assert_start_raises_init_error(0, ['-wallet=w1', '-wallet=w1'], 'Error loading wallet w1. Duplicate -wallet filename specified.')
|
||||||
|
|
||||||
# should not initialize if wallet file is a directory
|
# should not initialize if wallet file is a directory
|
||||||
wallet_dir = os.path.join(self.options.tmpdir, 'node0', 'regtest', 'wallets')
|
os.mkdir(wallet_dir('w11'))
|
||||||
os.mkdir(os.path.join(wallet_dir, 'w11'))
|
|
||||||
self.assert_start_raises_init_error(0, ['-wallet=w11'], 'Error loading wallet w11. -wallet filename must be a regular file.')
|
self.assert_start_raises_init_error(0, ['-wallet=w11'], 'Error loading wallet w11. -wallet filename must be a regular file.')
|
||||||
|
|
||||||
# should not initialize if one wallet is a copy of another
|
# should not initialize if one wallet is a copy of another
|
||||||
shutil.copyfile(os.path.join(wallet_dir, 'w2'), os.path.join(wallet_dir, 'w22'))
|
shutil.copyfile(wallet_dir('w2'), wallet_dir('w22'))
|
||||||
self.assert_start_raises_init_error(0, ['-wallet=w2', '-wallet=w22'], 'duplicates fileid')
|
self.assert_start_raises_init_error(0, ['-wallet=w2', '-wallet=w22'], 'duplicates fileid')
|
||||||
|
|
||||||
# should not initialize if wallet file is a symlink
|
# should not initialize if wallet file is a symlink
|
||||||
os.symlink(os.path.join(wallet_dir, 'w1'), os.path.join(wallet_dir, 'w12'))
|
os.symlink(wallet_dir('w1'), wallet_dir('w12'))
|
||||||
self.assert_start_raises_init_error(0, ['-wallet=w12'], 'Error loading wallet w12. -wallet filename must be a regular file.')
|
self.assert_start_raises_init_error(0, ['-wallet=w12'], 'Error loading wallet w12. -wallet filename must be a regular file.')
|
||||||
|
|
||||||
# should not initialize if the specified walletdir does not exist
|
# should not initialize if the specified walletdir does not exist
|
||||||
self.assert_start_raises_init_error(0, ['-walletdir=bad'], 'Error: Specified -walletdir "bad" does not exist')
|
self.assert_start_raises_init_error(0, ['-walletdir=bad'], 'Error: Specified -walletdir "bad" does not exist')
|
||||||
# should not initialize if the specified walletdir is not a directory
|
# should not initialize if the specified walletdir is not a directory
|
||||||
not_a_dir = os.path.join(wallet_dir, 'notadir')
|
not_a_dir = wallet_dir('notadir')
|
||||||
open(not_a_dir, 'a').close()
|
open(not_a_dir, 'a').close()
|
||||||
self.assert_start_raises_init_error(0, ['-walletdir='+not_a_dir], 'Error: Specified -walletdir "' + not_a_dir + '" is not a directory')
|
self.assert_start_raises_init_error(0, ['-walletdir=' + not_a_dir], 'Error: Specified -walletdir "' + not_a_dir + '" is not a directory')
|
||||||
|
|
||||||
# if wallets/ doesn't exist, datadir should be the default wallet dir
|
# if wallets/ doesn't exist, datadir should be the default wallet dir
|
||||||
wallet_dir2 = os.path.join(self.options.tmpdir, 'node0', 'regtest', 'walletdir')
|
wallet_dir2 = data_dir('walletdir')
|
||||||
os.rename(wallet_dir, wallet_dir2)
|
os.rename(wallet_dir(), wallet_dir2)
|
||||||
self.start_node(0, ['-wallet=w4', '-wallet=w5'])
|
self.start_node(0, ['-wallet=w4', '-wallet=w5'])
|
||||||
assert_equal(set(self.nodes[0].listwallets()), {"w4", "w5"})
|
assert_equal(set(node.listwallets()), {"w4", "w5"})
|
||||||
w5 = self.nodes[0].get_wallet_rpc("w5")
|
w5 = wallet("w5")
|
||||||
w5.generate(1)
|
w5.generate(1)
|
||||||
self.stop_node(0)
|
self.stop_node(0)
|
||||||
|
|
||||||
# now if wallets/ exists again, but the rootdir is specified as the walletdir, w4 and w5 should still be loaded
|
# now if wallets/ exists again, but the rootdir is specified as the walletdir, w4 and w5 should still be loaded
|
||||||
os.rename(wallet_dir2, wallet_dir)
|
os.rename(wallet_dir2, wallet_dir())
|
||||||
self.start_node(0, ['-wallet=w4', '-wallet=w5', '-walletdir=' + os.path.join(self.options.tmpdir, 'node0', 'regtest')])
|
self.start_node(0, ['-wallet=w4', '-wallet=w5', '-walletdir=' + data_dir()])
|
||||||
assert_equal(set(self.nodes[0].listwallets()), {"w4", "w5"})
|
assert_equal(set(node.listwallets()), {"w4", "w5"})
|
||||||
w5 = self.nodes[0].get_wallet_rpc("w5")
|
w5 = wallet("w5")
|
||||||
w5_info = w5.getwalletinfo()
|
w5_info = w5.getwalletinfo()
|
||||||
assert_equal(w5_info['immature_balance'], 50)
|
assert_equal(w5_info['immature_balance'], 50)
|
||||||
|
|
||||||
|
@ -67,11 +73,11 @@ class MultiWalletTest(BitcoinTestFramework):
|
||||||
|
|
||||||
self.start_node(0, self.extra_args[0])
|
self.start_node(0, self.extra_args[0])
|
||||||
|
|
||||||
w1 = self.nodes[0].get_wallet_rpc("w1")
|
w1 = wallet("w1")
|
||||||
w2 = self.nodes[0].get_wallet_rpc("w2")
|
w2 = wallet("w2")
|
||||||
w3 = self.nodes[0].get_wallet_rpc("w3")
|
w3 = wallet("w3")
|
||||||
w4 = self.nodes[0].get_wallet_rpc("w")
|
w4 = wallet("w")
|
||||||
wallet_bad = self.nodes[0].get_wallet_rpc("bad")
|
wallet_bad = wallet("bad")
|
||||||
|
|
||||||
w1.generate(1)
|
w1.generate(1)
|
||||||
|
|
||||||
|
@ -79,7 +85,7 @@ class MultiWalletTest(BitcoinTestFramework):
|
||||||
assert_raises_rpc_error(-18, "Requested wallet does not exist or is not loaded", wallet_bad.getwalletinfo)
|
assert_raises_rpc_error(-18, "Requested wallet does not exist or is not loaded", wallet_bad.getwalletinfo)
|
||||||
|
|
||||||
# accessing wallet RPC without using wallet endpoint fails
|
# accessing wallet RPC without using wallet endpoint fails
|
||||||
assert_raises_rpc_error(-19, "Wallet file not specified", self.nodes[0].getwalletinfo)
|
assert_raises_rpc_error(-19, "Wallet file not specified", node.getwalletinfo)
|
||||||
|
|
||||||
# check w1 wallet balance
|
# check w1 wallet balance
|
||||||
w1_info = w1.getwalletinfo()
|
w1_info = w1.getwalletinfo()
|
||||||
|
|
|
@ -92,6 +92,7 @@ BASE_SCRIPTS= [
|
||||||
'mempool_reorg.py',
|
'mempool_reorg.py',
|
||||||
'mempool_persist.py',
|
'mempool_persist.py',
|
||||||
'multiwallet.py',
|
'multiwallet.py',
|
||||||
|
'multiwallet.py --usecli',
|
||||||
'httpbasics.py',
|
'httpbasics.py',
|
||||||
'multi_rpc.py',
|
'multi_rpc.py',
|
||||||
'proxy_test.py',
|
'proxy_test.py',
|
||||||
|
|
Loading…
Reference in a new issue