mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-02-04 06:12:07 +01:00
b0113afd44
As reported by hebasto in https://github.com/bitcoin/bitcoin/issues/33545, newer libc++ versions implementing https://wg21.link/lwg3430 will no longer implicitly convert `fs::path` objects to `std::filesystem::path` objects when constructing `std::ifstream` and `std::ofstream` types. This is not a problem in Unix systems since `fs::path` objects use `std::string` as their native string type, but it causes compile errors on Windows which use `std::wstring` as their string type, since `fstream`s can't be constructed from `wstring`s. Fix the windows libc++ compile errors by adding a new `fs::path::std_path()` method and using it construct `fstream`s more portably. Additionally, delete `fs::path`'s implicit `native_string` conversion so these errors will not go undetected in the future, even though there is not currently a CI job testing Windows libc++ builds.
53 lines
1.7 KiB
C++
53 lines
1.7 KiB
C++
// Copyright (c) 2018-2022 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include <common/args.h>
|
|
#include <univalue.h>
|
|
#include <util/chaintype.h>
|
|
#include <util/check.h>
|
|
#include <util/fs.h>
|
|
|
|
#include <fstream>
|
|
#include <string>
|
|
|
|
#include <wallet/test/init_test_fixture.h>
|
|
|
|
namespace wallet {
|
|
InitWalletDirTestingSetup::InitWalletDirTestingSetup(const ChainType chainType) : BasicTestingSetup(chainType)
|
|
{
|
|
m_wallet_loader = MakeWalletLoader(*m_node.chain, m_args);
|
|
|
|
const auto sep = fs::path::preferred_separator;
|
|
|
|
m_datadir = m_args.GetDataDirNet();
|
|
m_cwd = fs::current_path();
|
|
|
|
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";
|
|
m_walletdir_path_cases["trailing"] = (m_datadir / "wallets") + sep;
|
|
m_walletdir_path_cases["trailing2"] = (m_datadir / "wallets") + sep + sep;
|
|
|
|
fs::current_path(m_datadir);
|
|
m_walletdir_path_cases["relative"] = "wallets";
|
|
|
|
fs::create_directories(m_walletdir_path_cases["default"]);
|
|
fs::create_directories(m_walletdir_path_cases["custom"]);
|
|
fs::create_directories(m_walletdir_path_cases["relative"]);
|
|
std::ofstream f{m_walletdir_path_cases["file"].std_path()};
|
|
f.close();
|
|
}
|
|
|
|
InitWalletDirTestingSetup::~InitWalletDirTestingSetup()
|
|
{
|
|
fs::current_path(m_cwd);
|
|
}
|
|
|
|
void InitWalletDirTestingSetup::SetWalletDir(const fs::path& walletdir_path)
|
|
{
|
|
m_args.ForceSetArg("-walletdir", fs::PathToString(walletdir_path));
|
|
}
|
|
} // namespace wallet
|