mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-20 13:37:28 +02:00
Merge 8209e86eeb into merged_master (Bitcoin PR bitcoin/bitcoin#28458)
This commit is contained in:
commit
40637b227e
10 changed files with 42 additions and 41 deletions
|
|
@ -41,7 +41,7 @@ bool LoadMempool(CTxMemPool& pool, const fs::path& load_path, Chainstate& active
|
|||
if (load_path.empty()) return false;
|
||||
|
||||
FILE* filestr{opts.mockable_fopen_function(load_path, "rb")};
|
||||
CAutoFile file(filestr, SER_DISK, CLIENT_VERSION);
|
||||
CAutoFile file{filestr, CLIENT_VERSION};
|
||||
if (file.IsNull()) {
|
||||
LogPrintf("Failed to open mempool file from disk. Continuing anyway.\n");
|
||||
return false;
|
||||
|
|
@ -157,7 +157,7 @@ bool DumpMempool(const CTxMemPool& pool, const fs::path& dump_path, FopenFn mock
|
|||
return false;
|
||||
}
|
||||
|
||||
CAutoFile file(filestr, SER_DISK, CLIENT_VERSION);
|
||||
CAutoFile file{filestr, CLIENT_VERSION};
|
||||
|
||||
uint64_t version = MEMPOOL_DUMP_VERSION;
|
||||
file << version;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue