Tests: Use self.chain instead of 'regtest' in almost all current tests
This commit is contained in:
parent
be50469217
commit
1abcecc40c
16 changed files with 44 additions and 44 deletions
|
@ -29,7 +29,7 @@ class AbortNodeTest(BitcoinTestFramework):
|
||||||
datadir = get_datadir_path(self.options.tmpdir, 0)
|
datadir = get_datadir_path(self.options.tmpdir, 0)
|
||||||
|
|
||||||
# Deleting the undo file will result in reorg failure
|
# Deleting the undo file will result in reorg failure
|
||||||
os.unlink(os.path.join(datadir, 'regtest', 'blocks', 'rev00000.dat'))
|
os.unlink(os.path.join(datadir, self.chain, 'blocks', 'rev00000.dat'))
|
||||||
|
|
||||||
# Connecting to a node with a more work chain will trigger a reorg
|
# Connecting to a node with a more work chain will trigger a reorg
|
||||||
# attempt.
|
# attempt.
|
||||||
|
|
|
@ -38,7 +38,7 @@ class ConfArgsTest(BitcoinTestFramework):
|
||||||
if self.is_wallet_compiled():
|
if self.is_wallet_compiled():
|
||||||
with open(inc_conf_file_path, 'w', encoding='utf8') as conf:
|
with open(inc_conf_file_path, 'w', encoding='utf8') as conf:
|
||||||
conf.write("wallet=foo\n")
|
conf.write("wallet=foo\n")
|
||||||
self.nodes[0].assert_start_raises_init_error(expected_msg='Error: Config setting for -wallet only applied on regtest network when in [regtest] section.')
|
self.nodes[0].assert_start_raises_init_error(expected_msg='Error: Config setting for -wallet only applied on %s network when in [%s] section.' % (self.chain, self.chain))
|
||||||
|
|
||||||
with open(inc_conf_file_path, 'w', encoding='utf-8') as conf:
|
with open(inc_conf_file_path, 'w', encoding='utf-8') as conf:
|
||||||
conf.write('regtest=0\n') # mainnet
|
conf.write('regtest=0\n') # mainnet
|
||||||
|
@ -103,7 +103,7 @@ class ConfArgsTest(BitcoinTestFramework):
|
||||||
# Check that using non-existent datadir in conf file fails
|
# Check that using non-existent datadir in conf file fails
|
||||||
conf_file = os.path.join(default_data_dir, "bitcoin.conf")
|
conf_file = os.path.join(default_data_dir, "bitcoin.conf")
|
||||||
|
|
||||||
# datadir needs to be set before [regtest] section
|
# datadir needs to be set before [chain] section
|
||||||
conf_file_contents = open(conf_file, encoding='utf8').read()
|
conf_file_contents = open(conf_file, encoding='utf8').read()
|
||||||
with open(conf_file, 'w', encoding='utf8') as f:
|
with open(conf_file, 'w', encoding='utf8') as f:
|
||||||
f.write("datadir=" + new_data_dir + "\n")
|
f.write("datadir=" + new_data_dir + "\n")
|
||||||
|
@ -115,17 +115,17 @@ class ConfArgsTest(BitcoinTestFramework):
|
||||||
os.mkdir(new_data_dir)
|
os.mkdir(new_data_dir)
|
||||||
self.start_node(0, ['-conf='+conf_file, '-wallet=w1'])
|
self.start_node(0, ['-conf='+conf_file, '-wallet=w1'])
|
||||||
self.stop_node(0)
|
self.stop_node(0)
|
||||||
assert os.path.exists(os.path.join(new_data_dir, 'regtest', 'blocks'))
|
assert os.path.exists(os.path.join(new_data_dir, self.chain, 'blocks'))
|
||||||
if self.is_wallet_compiled():
|
if self.is_wallet_compiled():
|
||||||
assert os.path.exists(os.path.join(new_data_dir, 'regtest', 'wallets', 'w1'))
|
assert os.path.exists(os.path.join(new_data_dir, self.chain, 'wallets', 'w1'))
|
||||||
|
|
||||||
# Ensure command line argument overrides datadir in conf
|
# Ensure command line argument overrides datadir in conf
|
||||||
os.mkdir(new_data_dir_2)
|
os.mkdir(new_data_dir_2)
|
||||||
self.nodes[0].datadir = new_data_dir_2
|
self.nodes[0].datadir = new_data_dir_2
|
||||||
self.start_node(0, ['-datadir='+new_data_dir_2, '-conf='+conf_file, '-wallet=w2'])
|
self.start_node(0, ['-datadir='+new_data_dir_2, '-conf='+conf_file, '-wallet=w2'])
|
||||||
assert os.path.exists(os.path.join(new_data_dir_2, 'regtest', 'blocks'))
|
assert os.path.exists(os.path.join(new_data_dir_2, self.chain, 'blocks'))
|
||||||
if self.is_wallet_compiled():
|
if self.is_wallet_compiled():
|
||||||
assert os.path.exists(os.path.join(new_data_dir_2, 'regtest', 'wallets', 'w2'))
|
assert os.path.exists(os.path.join(new_data_dir_2, self.chain, 'wallets', 'w2'))
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
|
@ -19,7 +19,7 @@ class FilelockTest(BitcoinTestFramework):
|
||||||
self.nodes[0].wait_for_rpc_connection()
|
self.nodes[0].wait_for_rpc_connection()
|
||||||
|
|
||||||
def run_test(self):
|
def run_test(self):
|
||||||
datadir = os.path.join(self.nodes[0].datadir, 'regtest')
|
datadir = os.path.join(self.nodes[0].datadir, self.chain)
|
||||||
self.log.info("Using datadir {}".format(datadir))
|
self.log.info("Using datadir {}".format(datadir))
|
||||||
|
|
||||||
self.log.info("Check that we can't start a second bitcoind instance using the same datadir")
|
self.log.info("Check that we can't start a second bitcoind instance using the same datadir")
|
||||||
|
|
|
@ -37,7 +37,7 @@ class LoadblockTest(BitcoinTestFramework):
|
||||||
cfg_file = os.path.join(data_dir, "linearize.cfg")
|
cfg_file = os.path.join(data_dir, "linearize.cfg")
|
||||||
bootstrap_file = os.path.join(self.options.tmpdir, "bootstrap.dat")
|
bootstrap_file = os.path.join(self.options.tmpdir, "bootstrap.dat")
|
||||||
genesis_block = self.nodes[0].getblockhash(0)
|
genesis_block = self.nodes[0].getblockhash(0)
|
||||||
blocks_dir = os.path.join(data_dir, "regtest", "blocks")
|
blocks_dir = os.path.join(data_dir, self.chain, "blocks")
|
||||||
hash_list = tempfile.NamedTemporaryFile(dir=data_dir,
|
hash_list = tempfile.NamedTemporaryFile(dir=data_dir,
|
||||||
mode='w',
|
mode='w',
|
||||||
delete=False,
|
delete=False,
|
||||||
|
|
|
@ -16,7 +16,7 @@ class LoggingTest(BitcoinTestFramework):
|
||||||
self.setup_clean_chain = True
|
self.setup_clean_chain = True
|
||||||
|
|
||||||
def relative_log_path(self, name):
|
def relative_log_path(self, name):
|
||||||
return os.path.join(self.nodes[0].datadir, "regtest", name)
|
return os.path.join(self.nodes[0].datadir, self.chain, name)
|
||||||
|
|
||||||
def run_test(self):
|
def run_test(self):
|
||||||
# test default log file name
|
# test default log file name
|
||||||
|
|
|
@ -100,7 +100,7 @@ class PruneTest(BitcoinTestFramework):
|
||||||
def setup_network(self):
|
def setup_network(self):
|
||||||
self.setup_nodes()
|
self.setup_nodes()
|
||||||
|
|
||||||
self.prunedir = os.path.join(self.nodes[2].datadir, 'regtest', 'blocks', '')
|
self.prunedir = os.path.join(self.nodes[2].datadir, self.chain, 'blocks', '')
|
||||||
|
|
||||||
connect_nodes(self.nodes[0], 1)
|
connect_nodes(self.nodes[0], 1)
|
||||||
connect_nodes(self.nodes[1], 2)
|
connect_nodes(self.nodes[1], 2)
|
||||||
|
@ -278,7 +278,7 @@ class PruneTest(BitcoinTestFramework):
|
||||||
assert_equal(ret, node.getblockchaininfo()['pruneheight'])
|
assert_equal(ret, node.getblockchaininfo()['pruneheight'])
|
||||||
|
|
||||||
def has_block(index):
|
def has_block(index):
|
||||||
return os.path.isfile(os.path.join(self.nodes[node_number].datadir, "regtest", "blocks", "blk{:05}.dat".format(index)))
|
return os.path.isfile(os.path.join(self.nodes[node_number].datadir, self.chain, "blocks", "blk{:05}.dat".format(index)))
|
||||||
|
|
||||||
# should not prune because chain tip of node 3 (995) < PruneAfterHeight (1000)
|
# should not prune because chain tip of node 3 (995) < PruneAfterHeight (1000)
|
||||||
assert_raises_rpc_error(-1, "Blockchain is too short for pruning", node.pruneblockchain, height(500))
|
assert_raises_rpc_error(-1, "Blockchain is too short for pruning", node.pruneblockchain, height(500))
|
||||||
|
|
|
@ -32,7 +32,7 @@ class RPCInterfaceTest(BitcoinTestFramework):
|
||||||
command = info['active_commands'][0]
|
command = info['active_commands'][0]
|
||||||
assert_equal(command['method'], 'getrpcinfo')
|
assert_equal(command['method'], 'getrpcinfo')
|
||||||
assert_greater_than_or_equal(command['duration'], 0)
|
assert_greater_than_or_equal(command['duration'], 0)
|
||||||
assert_equal(info['logpath'], os.path.join(self.nodes[0].datadir, 'regtest', 'debug.log'))
|
assert_equal(info['logpath'], os.path.join(self.nodes[0].datadir, self.chain, 'debug.log'))
|
||||||
|
|
||||||
def test_batch_request(self):
|
def test_batch_request(self):
|
||||||
self.log.info("Testing basic JSON-RPC batch request...")
|
self.log.info("Testing basic JSON-RPC batch request...")
|
||||||
|
|
|
@ -117,8 +117,8 @@ class MempoolPersistTest(BitcoinTestFramework):
|
||||||
wait_until(lambda: self.nodes[0].getmempoolinfo()["loaded"])
|
wait_until(lambda: self.nodes[0].getmempoolinfo()["loaded"])
|
||||||
assert_equal(len(self.nodes[0].getrawmempool()), 5)
|
assert_equal(len(self.nodes[0].getrawmempool()), 5)
|
||||||
|
|
||||||
mempooldat0 = os.path.join(self.nodes[0].datadir, 'regtest', 'mempool.dat')
|
mempooldat0 = os.path.join(self.nodes[0].datadir, self.chain, 'mempool.dat')
|
||||||
mempooldat1 = os.path.join(self.nodes[1].datadir, 'regtest', 'mempool.dat')
|
mempooldat1 = os.path.join(self.nodes[1].datadir, self.chain, 'mempool.dat')
|
||||||
self.log.debug("Remove the mempool.dat file. Verify that savemempool to disk via RPC re-creates it")
|
self.log.debug("Remove the mempool.dat file. Verify that savemempool to disk via RPC re-creates it")
|
||||||
os.remove(mempooldat0)
|
os.remove(mempooldat0)
|
||||||
self.nodes[0].savemempool()
|
self.nodes[0].savemempool()
|
||||||
|
|
|
@ -69,7 +69,7 @@ class MiningTest(BitcoinTestFramework):
|
||||||
self.log.info('getmininginfo')
|
self.log.info('getmininginfo')
|
||||||
mining_info = node.getmininginfo()
|
mining_info = node.getmininginfo()
|
||||||
assert_equal(mining_info['blocks'], 200)
|
assert_equal(mining_info['blocks'], 200)
|
||||||
assert_equal(mining_info['chain'], 'regtest')
|
assert_equal(mining_info['chain'], self.chain)
|
||||||
assert 'currentblocktx' not in mining_info
|
assert 'currentblocktx' not in mining_info
|
||||||
assert 'currentblockweight' not in mining_info
|
assert 'currentblockweight' not in mining_info
|
||||||
assert_equal(mining_info['difficulty'], Decimal('4.656542373906925E-10'))
|
assert_equal(mining_info['difficulty'], Decimal('4.656542373906925E-10'))
|
||||||
|
|
|
@ -54,7 +54,7 @@ class ScantxoutsetTest(BitcoinTestFramework):
|
||||||
|
|
||||||
self.log.info("Stop node, remove wallet, mine again some blocks...")
|
self.log.info("Stop node, remove wallet, mine again some blocks...")
|
||||||
self.stop_node(0)
|
self.stop_node(0)
|
||||||
shutil.rmtree(os.path.join(self.nodes[0].datadir, "regtest", 'wallets'))
|
shutil.rmtree(os.path.join(self.nodes[0].datadir, self.chain, 'wallets'))
|
||||||
self.start_node(0)
|
self.start_node(0)
|
||||||
self.nodes[0].generate(110)
|
self.nodes[0].generate(110)
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ class ToolWalletTest(BitcoinTestFramework):
|
||||||
|
|
||||||
def bitcoin_wallet_process(self, *args):
|
def bitcoin_wallet_process(self, *args):
|
||||||
binary = self.config["environment"]["BUILDDIR"] + '/src/bitcoin-wallet' + self.config["environment"]["EXEEXT"]
|
binary = self.config["environment"]["BUILDDIR"] + '/src/bitcoin-wallet' + self.config["environment"]["EXEEXT"]
|
||||||
args = ['-datadir={}'.format(self.nodes[0].datadir), '-regtest'] + list(args)
|
args = ['-datadir={}'.format(self.nodes[0].datadir), '-chain=%s' % self.chain] + list(args)
|
||||||
return subprocess.Popen([binary] + args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
|
return subprocess.Popen([binary] + args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
|
||||||
|
|
||||||
def assert_raises_tool_error(self, error, *args):
|
def assert_raises_tool_error(self, error, *args):
|
||||||
|
@ -197,7 +197,7 @@ class ToolWalletTest(BitcoinTestFramework):
|
||||||
self.log.debug('Wallet file shasum unchanged\n')
|
self.log.debug('Wallet file shasum unchanged\n')
|
||||||
|
|
||||||
def run_test(self):
|
def run_test(self):
|
||||||
self.wallet_path = os.path.join(self.nodes[0].datadir, 'regtest', 'wallets', 'wallet.dat')
|
self.wallet_path = os.path.join(self.nodes[0].datadir, self.chain, 'wallets', 'wallet.dat')
|
||||||
self.test_invalid_tool_commands_and_args()
|
self.test_invalid_tool_commands_and_args()
|
||||||
# Warning: The following tests are order-dependent.
|
# Warning: The following tests are order-dependent.
|
||||||
self.test_tool_wallet_info()
|
self.test_tool_wallet_info()
|
||||||
|
|
|
@ -107,9 +107,9 @@ class WalletBackupTest(BitcoinTestFramework):
|
||||||
self.stop_node(2)
|
self.stop_node(2)
|
||||||
|
|
||||||
def erase_three(self):
|
def erase_three(self):
|
||||||
os.remove(os.path.join(self.nodes[0].datadir, 'regtest', 'wallets', 'wallet.dat'))
|
os.remove(os.path.join(self.nodes[0].datadir, self.chain, 'wallets', 'wallet.dat'))
|
||||||
os.remove(os.path.join(self.nodes[1].datadir, 'regtest', 'wallets', 'wallet.dat'))
|
os.remove(os.path.join(self.nodes[1].datadir, self.chain, 'wallets', 'wallet.dat'))
|
||||||
os.remove(os.path.join(self.nodes[2].datadir, 'regtest', 'wallets', 'wallet.dat'))
|
os.remove(os.path.join(self.nodes[2].datadir, self.chain, 'wallets', 'wallet.dat'))
|
||||||
|
|
||||||
def run_test(self):
|
def run_test(self):
|
||||||
self.log.info("Generating initial blockchain")
|
self.log.info("Generating initial blockchain")
|
||||||
|
@ -167,13 +167,13 @@ class WalletBackupTest(BitcoinTestFramework):
|
||||||
self.erase_three()
|
self.erase_three()
|
||||||
|
|
||||||
# Start node2 with no chain
|
# Start node2 with no chain
|
||||||
shutil.rmtree(os.path.join(self.nodes[2].datadir, 'regtest', 'blocks'))
|
shutil.rmtree(os.path.join(self.nodes[2].datadir, self.chain, 'blocks'))
|
||||||
shutil.rmtree(os.path.join(self.nodes[2].datadir, 'regtest', 'chainstate'))
|
shutil.rmtree(os.path.join(self.nodes[2].datadir, self.chain, 'chainstate'))
|
||||||
|
|
||||||
# Restore wallets from backup
|
# Restore wallets from backup
|
||||||
shutil.copyfile(os.path.join(self.nodes[0].datadir, 'wallet.bak'), os.path.join(self.nodes[0].datadir, 'regtest', 'wallets', 'wallet.dat'))
|
shutil.copyfile(os.path.join(self.nodes[0].datadir, 'wallet.bak'), os.path.join(self.nodes[0].datadir, self.chain, 'wallets', 'wallet.dat'))
|
||||||
shutil.copyfile(os.path.join(self.nodes[1].datadir, 'wallet.bak'), os.path.join(self.nodes[1].datadir, 'regtest', 'wallets', 'wallet.dat'))
|
shutil.copyfile(os.path.join(self.nodes[1].datadir, 'wallet.bak'), os.path.join(self.nodes[1].datadir, self.chain, 'wallets', 'wallet.dat'))
|
||||||
shutil.copyfile(os.path.join(self.nodes[2].datadir, 'wallet.bak'), os.path.join(self.nodes[2].datadir, 'regtest', 'wallets', 'wallet.dat'))
|
shutil.copyfile(os.path.join(self.nodes[2].datadir, 'wallet.bak'), os.path.join(self.nodes[2].datadir, self.chain, 'wallets', 'wallet.dat'))
|
||||||
|
|
||||||
self.log.info("Re-starting nodes")
|
self.log.info("Re-starting nodes")
|
||||||
self.start_three()
|
self.start_three()
|
||||||
|
@ -188,8 +188,8 @@ class WalletBackupTest(BitcoinTestFramework):
|
||||||
self.erase_three()
|
self.erase_three()
|
||||||
|
|
||||||
#start node2 with no chain
|
#start node2 with no chain
|
||||||
shutil.rmtree(os.path.join(self.nodes[2].datadir, 'regtest', 'blocks'))
|
shutil.rmtree(os.path.join(self.nodes[2].datadir, self.chain, 'blocks'))
|
||||||
shutil.rmtree(os.path.join(self.nodes[2].datadir, 'regtest', 'chainstate'))
|
shutil.rmtree(os.path.join(self.nodes[2].datadir, self.chain, 'chainstate'))
|
||||||
|
|
||||||
self.start_three()
|
self.start_three()
|
||||||
|
|
||||||
|
@ -209,10 +209,10 @@ class WalletBackupTest(BitcoinTestFramework):
|
||||||
|
|
||||||
# Backup to source wallet file must fail
|
# Backup to source wallet file must fail
|
||||||
sourcePaths = [
|
sourcePaths = [
|
||||||
os.path.join(self.nodes[0].datadir, 'regtest', 'wallets', 'wallet.dat'),
|
os.path.join(self.nodes[0].datadir, self.chain, 'wallets', 'wallet.dat'),
|
||||||
os.path.join(self.nodes[0].datadir, 'regtest', '.', 'wallets', 'wallet.dat'),
|
os.path.join(self.nodes[0].datadir, self.chain, '.', 'wallets', 'wallet.dat'),
|
||||||
os.path.join(self.nodes[0].datadir, 'regtest', 'wallets', ''),
|
os.path.join(self.nodes[0].datadir, self.chain, 'wallets', ''),
|
||||||
os.path.join(self.nodes[0].datadir, 'regtest', 'wallets')]
|
os.path.join(self.nodes[0].datadir, self.chain, 'wallets')]
|
||||||
|
|
||||||
for sourcePath in sourcePaths:
|
for sourcePath in sourcePaths:
|
||||||
assert_raises_rpc_error(-4, "backup failed", self.nodes[0].backupwallet, sourcePath)
|
assert_raises_rpc_error(-4, "backup failed", self.nodes[0].backupwallet, sourcePath)
|
||||||
|
|
|
@ -67,11 +67,11 @@ class WalletHDTest(BitcoinTestFramework):
|
||||||
|
|
||||||
self.log.info("Restore backup ...")
|
self.log.info("Restore backup ...")
|
||||||
self.stop_node(1)
|
self.stop_node(1)
|
||||||
# we need to delete the complete regtest directory
|
# we need to delete the complete chain directory
|
||||||
# otherwise node1 would auto-recover all funds in flag the keypool keys as used
|
# otherwise node1 would auto-recover all funds in flag the keypool keys as used
|
||||||
shutil.rmtree(os.path.join(self.nodes[1].datadir, "regtest", "blocks"))
|
shutil.rmtree(os.path.join(self.nodes[1].datadir, self.chain, "blocks"))
|
||||||
shutil.rmtree(os.path.join(self.nodes[1].datadir, "regtest", "chainstate"))
|
shutil.rmtree(os.path.join(self.nodes[1].datadir, self.chain, "chainstate"))
|
||||||
shutil.copyfile(os.path.join(self.nodes[1].datadir, "hd.bak"), os.path.join(self.nodes[1].datadir, "regtest", "wallets", "wallet.dat"))
|
shutil.copyfile(os.path.join(self.nodes[1].datadir, "hd.bak"), os.path.join(self.nodes[1].datadir, self.chain, "wallets", "wallet.dat"))
|
||||||
self.start_node(1)
|
self.start_node(1)
|
||||||
|
|
||||||
# Assert that derivation is deterministic
|
# Assert that derivation is deterministic
|
||||||
|
@ -92,9 +92,9 @@ class WalletHDTest(BitcoinTestFramework):
|
||||||
|
|
||||||
# Try a RPC based rescan
|
# Try a RPC based rescan
|
||||||
self.stop_node(1)
|
self.stop_node(1)
|
||||||
shutil.rmtree(os.path.join(self.nodes[1].datadir, "regtest", "blocks"))
|
shutil.rmtree(os.path.join(self.nodes[1].datadir, self.chain, "blocks"))
|
||||||
shutil.rmtree(os.path.join(self.nodes[1].datadir, "regtest", "chainstate"))
|
shutil.rmtree(os.path.join(self.nodes[1].datadir, self.chain, "chainstate"))
|
||||||
shutil.copyfile(os.path.join(self.nodes[1].datadir, "hd.bak"), os.path.join(self.nodes[1].datadir, "regtest", "wallets", "wallet.dat"))
|
shutil.copyfile(os.path.join(self.nodes[1].datadir, "hd.bak"), os.path.join(self.nodes[1].datadir, self.chain, "wallets", "wallet.dat"))
|
||||||
self.start_node(1, extra_args=self.extra_args[1])
|
self.start_node(1, extra_args=self.extra_args[1])
|
||||||
connect_nodes(self.nodes[0], 1)
|
connect_nodes(self.nodes[0], 1)
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
|
|
|
@ -30,7 +30,7 @@ class KeypoolRestoreTest(BitcoinTestFramework):
|
||||||
self.skip_if_no_wallet()
|
self.skip_if_no_wallet()
|
||||||
|
|
||||||
def run_test(self):
|
def run_test(self):
|
||||||
wallet_path = os.path.join(self.nodes[1].datadir, "regtest", "wallets", "wallet.dat")
|
wallet_path = os.path.join(self.nodes[1].datadir, self.chain, "wallets", "wallet.dat")
|
||||||
wallet_backup_path = os.path.join(self.nodes[1].datadir, "wallet.bak")
|
wallet_backup_path = os.path.join(self.nodes[1].datadir, "wallet.bak")
|
||||||
self.nodes[0].generate(101)
|
self.nodes[0].generate(101)
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ class MultiWalletTest(BitcoinTestFramework):
|
||||||
def run_test(self):
|
def run_test(self):
|
||||||
node = self.nodes[0]
|
node = self.nodes[0]
|
||||||
|
|
||||||
data_dir = lambda *p: os.path.join(node.datadir, 'regtest', *p)
|
data_dir = lambda *p: os.path.join(node.datadir, self.chain, *p)
|
||||||
wallet_dir = lambda *p: data_dir('wallets', *p)
|
wallet_dir = lambda *p: data_dir('wallets', *p)
|
||||||
wallet = lambda name: node.get_wallet_rpc(name)
|
wallet = lambda name: node.get_wallet_rpc(name)
|
||||||
|
|
||||||
|
@ -187,7 +187,7 @@ class MultiWalletTest(BitcoinTestFramework):
|
||||||
assert_equal(w4.getbalance(), 3)
|
assert_equal(w4.getbalance(), 3)
|
||||||
|
|
||||||
batch = w1.batch([w1.getblockchaininfo.get_request(), w1.getwalletinfo.get_request()])
|
batch = w1.batch([w1.getblockchaininfo.get_request(), w1.getwalletinfo.get_request()])
|
||||||
assert_equal(batch[0]["result"]["chain"], "regtest")
|
assert_equal(batch[0]["result"]["chain"], self.chain)
|
||||||
assert_equal(batch[1]["result"]["walletname"], "w1")
|
assert_equal(batch[1]["result"]["walletname"], "w1")
|
||||||
|
|
||||||
self.log.info('Check for per-wallet settxfee call')
|
self.log.info('Check for per-wallet settxfee call')
|
||||||
|
|
|
@ -90,7 +90,7 @@ class ReorgsRestoreTest(BitcoinTestFramework):
|
||||||
# Node0 wallet file is loaded on longest sync'ed node1
|
# Node0 wallet file is loaded on longest sync'ed node1
|
||||||
self.stop_node(1)
|
self.stop_node(1)
|
||||||
self.nodes[0].backupwallet(os.path.join(self.nodes[0].datadir, 'wallet.bak'))
|
self.nodes[0].backupwallet(os.path.join(self.nodes[0].datadir, 'wallet.bak'))
|
||||||
shutil.copyfile(os.path.join(self.nodes[0].datadir, 'wallet.bak'), os.path.join(self.nodes[1].datadir, 'regtest', 'wallet.dat'))
|
shutil.copyfile(os.path.join(self.nodes[0].datadir, 'wallet.bak'), os.path.join(self.nodes[1].datadir, self.chain, 'wallet.dat'))
|
||||||
self.start_node(1)
|
self.start_node(1)
|
||||||
tx_after_reorg = self.nodes[1].gettransaction(txid)
|
tx_after_reorg = self.nodes[1].gettransaction(txid)
|
||||||
# Check that normal confirmed tx is confirmed again but with different blockhash
|
# Check that normal confirmed tx is confirmed again but with different blockhash
|
||||||
|
|
Loading…
Reference in a new issue