Merge 3ace3a17c9 into merged_master (Bitcoin PR bitcoin/bitcoin#20744)

This commit is contained in:
Byron Hambly 2023-06-30 07:19:01 +00:00
commit 4988afcbc2
50 changed files with 253 additions and 564 deletions

View file

@ -24,7 +24,8 @@
#include <script/bitcoinconsensus.h>
#endif
#include <stdint.h>
#include <cstdint>
#include <fstream>
#include <string>
#include <vector>
@ -1734,7 +1735,7 @@ BOOST_AUTO_TEST_CASE(script_assets_test)
bool exists = fs::exists(path);
BOOST_WARN_MESSAGE(exists, "File $DIR_UNIT_TEST_DATA/script_assets_test.json not found, skipping script_assets_test");
if (!exists) return;
fs::ifstream file(path);
std::ifstream file{path};
BOOST_CHECK(file.is_open());
file.seekg(0, std::ios::end);
size_t length = file.tellg();