From 021c3d892fb6b801143bb433e85f329fd250c97d Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Wed, 19 Jan 2022 15:21:25 -0500 Subject: fs: Make compatible with boost 1.78 Github-Pull: #24104 Rebased-From: dc5d6b0d4793ca978f71f69ef7d6b818794676c2 --- src/wallet/load.cpp | 2 +- test/functional/wallet_multiwallet.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wallet/load.cpp b/src/wallet/load.cpp index dbf9fd46b6..845fd10182 100644 --- a/src/wallet/load.cpp +++ b/src/wallet/load.cpp @@ -22,7 +22,7 @@ bool VerifyWallets(interfaces::Chain& chain) fs::path wallet_dir = gArgs.GetArg("-walletdir", ""); boost::system::error_code error; // The canonical path cleans the path, preventing >1 Berkeley environment instances for the same directory - fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error); + fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error).remove_trailing_separator(); if (error || !fs::exists(wallet_dir)) { chain.initError(strprintf(_("Specified -walletdir \"%s\" does not exist"), wallet_dir.string())); return false; diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py index 00d2c9ffe4..92e48d4fb7 100755 --- a/test/functional/wallet_multiwallet.py +++ b/test/functional/wallet_multiwallet.py @@ -141,7 +141,7 @@ class MultiWalletTest(BitcoinTestFramework): # should raise rpc error if wallet path can't be created err_code = -4 if self.options.descriptors else -1 - assert_raises_rpc_error(err_code, "boost::filesystem::create_directory:", self.nodes[0].createwallet, "w8/bad") + assert_raises_rpc_error(err_code, "boost::filesystem::create_director", self.nodes[0].createwallet, "w8/bad") # check that all requested wallets were created self.stop_node(0) -- cgit v1.2.3