wallet: Remove path checking code from loadwallet RPC
This commit does not change behavior except for error messages which now include more complete information.
This commit is contained in:
parent
8b5e7297c0
commit
a987438e9d
|
@ -2503,25 +2503,20 @@ static UniValue loadwallet(const JSONRPCRequest& request)
|
||||||
|
|
||||||
WalletContext& context = EnsureWalletContext(request.context);
|
WalletContext& context = EnsureWalletContext(request.context);
|
||||||
const std::string name(request.params[0].get_str());
|
const std::string name(request.params[0].get_str());
|
||||||
fs::path path(fs::absolute(name, GetWalletDir()));
|
|
||||||
|
|
||||||
if (fs::symlink_status(path).type() == fs::file_not_found) {
|
|
||||||
throw JSONRPCError(RPC_WALLET_NOT_FOUND, "Wallet " + name + " not found.");
|
|
||||||
} else if (fs::is_directory(path)) {
|
|
||||||
// The given filename is a directory. Check that there's a wallet.dat file.
|
|
||||||
fs::path wallet_dat_file = path / "wallet.dat";
|
|
||||||
if (fs::symlink_status(wallet_dat_file).type() == fs::file_not_found) {
|
|
||||||
throw JSONRPCError(RPC_WALLET_NOT_FOUND, "Directory " + name + " does not contain a wallet.dat file.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
DatabaseOptions options;
|
DatabaseOptions options;
|
||||||
DatabaseStatus status;
|
DatabaseStatus status;
|
||||||
|
options.require_existing = true;
|
||||||
bilingual_str error;
|
bilingual_str error;
|
||||||
std::vector<bilingual_str> warnings;
|
std::vector<bilingual_str> warnings;
|
||||||
Optional<bool> load_on_start = request.params[1].isNull() ? nullopt : Optional<bool>(request.params[1].get_bool());
|
Optional<bool> load_on_start = request.params[1].isNull() ? nullopt : Optional<bool>(request.params[1].get_bool());
|
||||||
std::shared_ptr<CWallet> const wallet = LoadWallet(*context.chain, name, load_on_start, options, status, error, warnings);
|
std::shared_ptr<CWallet> const wallet = LoadWallet(*context.chain, name, load_on_start, options, status, error, warnings);
|
||||||
if (!wallet) throw JSONRPCError(RPC_WALLET_ERROR, error.original);
|
if (!wallet) {
|
||||||
|
// Map bad format to not found, since bad format is returned when the
|
||||||
|
// wallet directory exists, but doesn't contain a data file.
|
||||||
|
RPCErrorCode code = status == DatabaseStatus::FAILED_NOT_FOUND || status == DatabaseStatus::FAILED_BAD_FORMAT ? RPC_WALLET_NOT_FOUND : RPC_WALLET_ERROR;
|
||||||
|
throw JSONRPCError(code, error.original);
|
||||||
|
}
|
||||||
|
|
||||||
UniValue obj(UniValue::VOBJ);
|
UniValue obj(UniValue::VOBJ);
|
||||||
obj.pushKV("name", wallet->GetName());
|
obj.pushKV("name", wallet->GetName());
|
||||||
|
|
|
@ -129,7 +129,8 @@ class RpcCreateMultiSigTest(BitcoinTestFramework):
|
||||||
try:
|
try:
|
||||||
node1.loadwallet('wmulti')
|
node1.loadwallet('wmulti')
|
||||||
except JSONRPCException as e:
|
except JSONRPCException as e:
|
||||||
if e.error['code'] == -18 and 'Wallet wmulti not found' in e.error['message']:
|
path = os.path.join(self.options.tmpdir, "node1", "regtest", "wallets", "wmulti")
|
||||||
|
if e.error['code'] == -18 and "Wallet file verification failed. Failed to load database path '{}'. Path does not exist.".format(path) in e.error['message']:
|
||||||
node1.createwallet(wallet_name='wmulti', disable_private_keys=True)
|
node1.createwallet(wallet_name='wmulti', disable_private_keys=True)
|
||||||
else:
|
else:
|
||||||
raise
|
raise
|
||||||
|
|
|
@ -244,7 +244,8 @@ class MultiWalletTest(BitcoinTestFramework):
|
||||||
assert_equal(set(self.nodes[0].listwallets()), set(wallet_names))
|
assert_equal(set(self.nodes[0].listwallets()), set(wallet_names))
|
||||||
|
|
||||||
# Fail to load if wallet doesn't exist
|
# Fail to load if wallet doesn't exist
|
||||||
assert_raises_rpc_error(-18, 'Wallet wallets not found.', self.nodes[0].loadwallet, 'wallets')
|
path = os.path.join(self.options.tmpdir, "node0", "regtest", "wallets", "wallets")
|
||||||
|
assert_raises_rpc_error(-18, "Wallet file verification failed. Failed to load database path '{}'. Path does not exist.".format(path), self.nodes[0].loadwallet, 'wallets')
|
||||||
|
|
||||||
# Fail to load duplicate wallets
|
# Fail to load duplicate wallets
|
||||||
path = os.path.join(self.options.tmpdir, "node0", "regtest", "wallets", "w1", "wallet.dat")
|
path = os.path.join(self.options.tmpdir, "node0", "regtest", "wallets", "w1", "wallet.dat")
|
||||||
|
@ -266,7 +267,8 @@ class MultiWalletTest(BitcoinTestFramework):
|
||||||
|
|
||||||
# Fail to load if a directory is specified that doesn't contain a wallet
|
# Fail to load if a directory is specified that doesn't contain a wallet
|
||||||
os.mkdir(wallet_dir('empty_wallet_dir'))
|
os.mkdir(wallet_dir('empty_wallet_dir'))
|
||||||
assert_raises_rpc_error(-18, "Directory empty_wallet_dir does not contain a wallet.dat file", self.nodes[0].loadwallet, 'empty_wallet_dir')
|
path = os.path.join(self.options.tmpdir, "node0", "regtest", "wallets", "empty_wallet_dir")
|
||||||
|
assert_raises_rpc_error(-18, "Wallet file verification failed. Failed to load database path '{}'. Data is not in recognized format.".format(path), self.nodes[0].loadwallet, 'empty_wallet_dir')
|
||||||
|
|
||||||
self.log.info("Test dynamic wallet creation.")
|
self.log.info("Test dynamic wallet creation.")
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue