mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-09 05:14:22 +01:00
Code Issues Projects Releases Wiki Activity

wallet: Handle duplicate fileid exception

Browse source
This commit is contained in:
João Barbosa 2020-03-28 02:14:08 +00:00
parent 9a2b5f22c1
commit ee9e88ba27
3 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/wallet/load.cpp
View file

@ -66,19 +66,23 @@ bool VerifyWallets(interfaces::Chain& chain, const std::vector<std::string>& wal
bool LoadWallets(interfaces::Chain& chain, const std::vector<std::string>& wallet_files) bool LoadWallets(interfaces::Chain& chain, const std::vector<std::string>& wallet_files)
{ {
for (const std::string& walletFile : wallet_files) { try {
std::string error; for (const std::string& walletFile : wallet_files) {
std::vector<std::string> warnings; std::string error;
std::shared_ptr<CWallet> pwallet = CWallet::CreateWalletFromFile(chain, WalletLocation(walletFile), error, warnings); std::vector<std::string> warnings;
if (!warnings.empty()) chain.initWarning(Join(warnings, "\n")); std::shared_ptr<CWallet> pwallet = CWallet::CreateWalletFromFile(chain, WalletLocation(walletFile), error, warnings);
if (!pwallet) { if (!warnings.empty()) chain.initWarning(Join(warnings, "\n"));
chain.initError(error); if (!pwallet) {
return false; chain.initError(error);
return false;
}
AddWallet(pwallet);
} }
AddWallet(pwallet); return true;
} catch (const std::runtime_error& e) {
chain.initError(e.what());
return false;
} }
return true;
} }
void StartWallets(CScheduler& scheduler) void StartWallets(CScheduler& scheduler)

25
src/wallet/wallet.cpp
View file

@ -148,19 +148,24 @@ void UnloadWallet(std::shared_ptr<CWallet>&& wallet)
std::shared_ptr<CWallet> LoadWallet(interfaces::Chain& chain, const WalletLocation& location, std::string& error, std::vector<std::string>& warnings) std::shared_ptr<CWallet> LoadWallet(interfaces::Chain& chain, const WalletLocation& location, std::string& error, std::vector<std::string>& warnings)
{ {
if (!CWallet::Verify(chain, location, false, error, warnings)) { try {
error = "Wallet file verification failed: " + error; if (!CWallet::Verify(chain, location, false, error, warnings)) {
return nullptr; error = "Wallet file verification failed: " + error;
} return nullptr;
}
std::shared_ptr<CWallet> wallet = CWallet::CreateWalletFromFile(chain, location, error, warnings); std::shared_ptr<CWallet> wallet = CWallet::CreateWalletFromFile(chain, location, error, warnings);
if (!wallet) { if (!wallet) {
error = "Wallet loading failed: " + error; error = "Wallet loading failed: " + error;
return nullptr;
}
AddWallet(wallet);
wallet->postInitProcess();
return wallet;
} catch (const std::runtime_error& e) {
error = e.what();
return nullptr; return nullptr;
} }
AddWallet(wallet);
wallet->postInitProcess();
return wallet;
} }
std::shared_ptr<CWallet> LoadWallet(interfaces::Chain& chain, const std::string& name, std::string& error, std::vector<std::string>& warnings) std::shared_ptr<CWallet> LoadWallet(interfaces::Chain& chain, const std::string& name, std::string& error, std::vector<std::string>& warnings)

4
test/functional/wallet_multiwallet.py
View file

@ -236,10 +236,10 @@ class MultiWalletTest(BitcoinTestFramework):
assert_raises_rpc_error(-4, "Wallet file verification failed: Error loading wallet wallet.dat. Duplicate -wallet filename specified.", self.nodes[0].loadwallet, 'wallet.dat') assert_raises_rpc_error(-4, "Wallet file verification failed: Error loading wallet wallet.dat. Duplicate -wallet filename specified.", self.nodes[0].loadwallet, 'wallet.dat')
# Fail to load if one wallet is a copy of another # Fail to load if one wallet is a copy of another
assert_raises_rpc_error(-1, "BerkeleyBatch: Can't open database w8_copy (duplicates fileid", self.nodes[0].loadwallet, 'w8_copy') assert_raises_rpc_error(-4, "BerkeleyBatch: Can't open database w8_copy (duplicates fileid", self.nodes[0].loadwallet, 'w8_copy')
# Fail to load if one wallet is a copy of another, test this twice to make sure that we don't re-introduce #14304 # Fail to load if one wallet is a copy of another, test this twice to make sure that we don't re-introduce #14304
assert_raises_rpc_error(-1, "BerkeleyBatch: Can't open database w8_copy (duplicates fileid", self.nodes[0].loadwallet, 'w8_copy') assert_raises_rpc_error(-4, "BerkeleyBatch: Can't open database w8_copy (duplicates fileid", self.nodes[0].loadwallet, 'w8_copy')
# Fail to load if wallet file is a symlink # Fail to load if wallet file is a symlink