Merge 84cd6478c4 into merged_master (Bitcoin PR bitcoin/bitcoin#30927)

This commit is contained in:
ivanlele 2026-03-26 15:51:45 +00:00
commit 3c2044c0fe
No known key found for this signature in database
4 changed files with 9 additions and 19 deletions

View file

@ -777,10 +777,6 @@ bool BlockManager::UndoWriteToDisk(const CBlockUndo& blockundo, FlatFilePos& pos
// Write undo data
long fileOutPos = fileout.tell();
if (fileOutPos < 0) {
LogError("%s: ftell failed\n", __func__);
return false;
}
pos.nPos = (unsigned int)fileOutPos;
fileout << blockundo;
@ -1075,10 +1071,6 @@ bool BlockManager::WriteBlockToDisk(const CBlock& block, FlatFilePos& pos) const
// Write block
long fileOutPos = fileout.tell();
if (fileOutPos < 0) {
LogError("%s: ftell failed\n", __func__);
return false;
}
pos.nPos = (unsigned int)fileOutPos;
fileout << TX_WITH_WITNESS(block);