Browse Source

[wallet] Specify wallet name in wallet loading errors

tags/v0.15.1
John Newbery 3 years ago
parent
commit
d84e78ec39
2 changed files with 7 additions and 7 deletions
  1. 4
    4
      src/wallet/wallet.cpp
  2. 3
    3
      test/functional/multiwallet.py

+ 4
- 4
src/wallet/wallet.cpp View File

@@ -473,21 +473,21 @@ bool CWallet::Verify()

for (const std::string& walletFile : gArgs.GetArgs("-wallet")) {
if (boost::filesystem::path(walletFile).filename() != walletFile) {
return InitError(_("-wallet parameter must only specify a filename (not a path)"));
return InitError(strprintf(_("Error loading wallet %s. -wallet parameter must only specify a filename (not a path)."), walletFile));
}

if (SanitizeString(walletFile, SAFE_CHARS_FILENAME) != walletFile) {
return InitError(_("Invalid characters in -wallet filename"));
return InitError(strprintf(_("Error loading wallet %s. Invalid characters in -wallet filename."), walletFile));
}

fs::path wallet_path = fs::absolute(walletFile, GetDataDir());

if (fs::exists(wallet_path) && (!fs::is_regular_file(wallet_path) || fs::is_symlink(wallet_path))) {
return InitError(_("Invalid -wallet file"));
return InitError(strprintf(_("Error loading wallet %s. -wallet filename must be a regular file."), walletFile));
}

if (!wallet_paths.insert(wallet_path).second) {
return InitError(_("Duplicate -wallet filename"));
return InitError(strprintf(_("Error loading wallet %s. Duplicate -wallet filename specified."), walletFile));
}

std::string strError;

+ 3
- 3
test/functional/multiwallet.py View File

@@ -23,15 +23,15 @@ class MultiWalletTest(BitcoinTestFramework):
self.stop_node(0)

# should not initialize if there are duplicate wallets
self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w1', '-wallet=w1'], 'Duplicate -wallet filename')
self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w1', '-wallet=w1'], 'Error loading wallet w1. Duplicate -wallet filename specified.')

# should not initialize if wallet file is a directory
os.mkdir(os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w11'))
self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w11'], 'Invalid -wallet file')
self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w11'], 'Error loading wallet w11. -wallet filename must be a regular file.')

# should not initialize if wallet file is a symlink
os.symlink(os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w1'), os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w12'))
self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w12'], 'Invalid -wallet file')
self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w12'], 'Error loading wallet w12. -wallet filename must be a regular file.')

self.nodes[0] = self.start_node(0, self.options.tmpdir, self.extra_args[0])


Loading…
Cancel
Save