Merge 54c4b09f08 into merged_master (Bitcoin PR bitcoin/bitcoin#31042)

This commit is contained in:
Tom Trevethan 2026-04-01 17:24:49 +01:00
commit 030ab66c70
56 changed files with 153 additions and 147 deletions

View file

@ -106,7 +106,7 @@ static void ExitFailure(std::string_view str_err)
}
BasicTestingSetup::BasicTestingSetup(const ChainType chainType, TestOpts opts, const std::string& fedpegscript)
: m_path_root{fs::temp_directory_path() / "test_common_" PACKAGE_NAME / g_rng_temp_path.rand256().ToString()},
: m_path_root{fs::temp_directory_path() / "test_common_" CLIENT_NAME / g_rng_temp_path.rand256().ToString()},
m_args{}
{
// Hack to allow testing of fedpeg args