Build: Upgrade boost dependency to version 1.83 (#2696)

* Upgrade boost version to 1.83 * Resolve unit test * Resolve compiler wanting * Fix failing test --------- Co-authored-by: Bushstar <[email protected]>
DeFiCh · Nov 21, 2023 · b4713b7 · b4713b7
1 parent 5651495
commit b4713b7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
@@ -3,9 +3,10 @@ package=boost
 # Official version hashes
 # 77: fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854
 # 78: 8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc
+# 83: 6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e
 
-$(package)_version=1_77_0
-$(package)_sha256_hash=fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854
+$(package)_version=1_83_0
+$(package)_sha256_hash=6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e
 
 $(package)_version_dot=$(subst _,.,$($(package)_version))
 $(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(package)_version_dot)/source/

diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
@@ -875,7 +875,7 @@ bool BerkeleyDatabase::Backup(const std::string& strDest)
                         return false;
                     }
 
-                    fs::copy_file(pathSrc, pathDest, fs::copy_option::overwrite_if_exists);
+                    fs::copy_file(pathSrc, pathDest, fs::copy_options::overwrite_existing);
                     LogPrintf("copied %s to %s\n", strFile, pathDest.string());
                     return true;
                 } catch (const fs::filesystem_error& e) {

diff --git a/src/wallet/test/init_test_fixture.cpp b/src/wallet/test/init_test_fixture.cpp
@@ -17,7 +17,7 @@ InitWalletDirTestingSetup::InitWalletDirTestingSetup(const std::string& chainNam
     m_datadir = GetDataDir();
     m_cwd = fs::current_path();
 
-    m_walletdir_path_cases["default"] = m_datadir / "wallets";
+    m_walletdir_path_cases["default"] = m_datadir / "wallets/";
     m_walletdir_path_cases["custom"] = m_datadir / "my_wallets";
     m_walletdir_path_cases["nonexistent"] = m_datadir / "path_does_not_exist";
     m_walletdir_path_cases["file"] = m_datadir / "not_a_directory.dat";

diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py
@@ -104,7 +104,7 @@ def wallet_file(name):
             assert_equal(os.path.isfile(wallet_file(wallet_name)), True)
 
         # should not initialize if wallet path can't be created
-        exp_stderr = "boost::filesystem::create_directory:"
+        exp_stderr = "boost::filesystem::create_directories:"
         self.nodes[0].assert_start_raises_init_error(
             ["-wallet=wallet.dat/bad"], exp_stderr, match=ErrorMatch.PARTIAL_REGEX
         )