refactor: switch from CAutoFile to AutoFile

This commit is contained in:
Anthony Towns 2023-11-15 13:10:13 +10:00
parent bbd4646a2e
commit cde9a4b137
3 changed files with 5 additions and 5 deletions

View file

@ -55,7 +55,7 @@ static void LoadExternalBlockFile(benchmark::Bench& bench)
bench.run([&] { bench.run([&] {
// "rb" is "binary, O_RDONLY", positioned to the start of the file. // "rb" is "binary, O_RDONLY", positioned to the start of the file.
// The file will be closed by LoadExternalBlockFile(). // The file will be closed by LoadExternalBlockFile().
CAutoFile file{fsbridge::fopen(blkfile, "rb"), CLIENT_VERSION}; AutoFile file{fsbridge::fopen(blkfile, "rb")};
testing_setup->m_node.chainman->LoadExternalBlockFile(file, &pos, &blocks_with_unknown_parent); testing_setup->m_node.chainman->LoadExternalBlockFile(file, &pos, &blocks_with_unknown_parent);
}); });
fs::remove(blkfile); fs::remove(blkfile);

View file

@ -14,7 +14,7 @@
static void FindByte(benchmark::Bench& bench) static void FindByte(benchmark::Bench& bench)
{ {
// Setup // Setup
CAutoFile file{fsbridge::fopen("streams_tmp", "w+b"), 0}; AutoFile file{fsbridge::fopen("streams_tmp", "w+b")};
const size_t file_size = 200; const size_t file_size = 200;
uint8_t data[file_size] = {0}; uint8_t data[file_size] = {0};
data[file_size-1] = 1; data[file_size-1] = 1;

View file

@ -249,7 +249,7 @@ BOOST_AUTO_TEST_CASE(streams_serializedata_xor)
BOOST_AUTO_TEST_CASE(streams_buffered_file) BOOST_AUTO_TEST_CASE(streams_buffered_file)
{ {
fs::path streams_test_filename = m_args.GetDataDirBase() / "streams_test_tmp"; fs::path streams_test_filename = m_args.GetDataDirBase() / "streams_test_tmp";
CAutoFile file{fsbridge::fopen(streams_test_filename, "w+b"), 333}; AutoFile file{fsbridge::fopen(streams_test_filename, "w+b")};
// The value at each offset is the offset. // The value at each offset is the offset.
for (uint8_t j = 0; j < 40; ++j) { for (uint8_t j = 0; j < 40; ++j) {
@ -380,7 +380,7 @@ BOOST_AUTO_TEST_CASE(streams_buffered_file)
BOOST_AUTO_TEST_CASE(streams_buffered_file_skip) BOOST_AUTO_TEST_CASE(streams_buffered_file_skip)
{ {
fs::path streams_test_filename = m_args.GetDataDirBase() / "streams_test_tmp"; fs::path streams_test_filename = m_args.GetDataDirBase() / "streams_test_tmp";
CAutoFile file{fsbridge::fopen(streams_test_filename, "w+b"), 333}; AutoFile file{fsbridge::fopen(streams_test_filename, "w+b")};
// The value at each offset is the byte offset (e.g. byte 1 in the file has the value 0x01). // The value at each offset is the byte offset (e.g. byte 1 in the file has the value 0x01).
for (uint8_t j = 0; j < 40; ++j) { for (uint8_t j = 0; j < 40; ++j) {
file << j; file << j;
@ -433,7 +433,7 @@ BOOST_AUTO_TEST_CASE(streams_buffered_file_rand)
fs::path streams_test_filename = m_args.GetDataDirBase() / "streams_test_tmp"; fs::path streams_test_filename = m_args.GetDataDirBase() / "streams_test_tmp";
for (int rep = 0; rep < 50; ++rep) { for (int rep = 0; rep < 50; ++rep) {
CAutoFile file{fsbridge::fopen(streams_test_filename, "w+b"), 333}; AutoFile file{fsbridge::fopen(streams_test_filename, "w+b")};
size_t fileSize = InsecureRandRange(256); size_t fileSize = InsecureRandRange(256);
for (uint8_t i = 0; i < fileSize; ++i) { for (uint8_t i = 0; i < fileSize; ++i) {
file << i; file << i;