mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-13 12:33:42 +02:00
scripted-diff: rename block and undo functions for consistency
Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
Co-authored-by: Hodlinator <172445034+hodlinator@users.noreply.github.com>
-BEGIN VERIFY SCRIPT-
grep -r -wE 'WriteBlock|ReadRawBlock|ReadBlock|WriteBlockUndo|ReadBlockUndo' $(git ls-files src/ ':!src/leveldb') && \
echo "Error: One or more target names already exist!" && exit 1
sed -i \
-e 's/\bSaveBlockToDisk/WriteBlock/g' \
-e 's/\bReadRawBlockFromDisk/ReadRawBlock/g' \
-e 's/\bReadBlockFromDisk/ReadBlock/g' \
-e 's/\bWriteUndoDataForBlock/WriteBlockUndo/g' \
-e 's/\bUndoReadFromDisk/ReadBlockUndo/g' \
$(git ls-files src/ ':!src/leveldb')
-END VERIFY SCRIPT-
This commit is contained in:
parent
baaa3b2846
commit
223081ece6
18 changed files with 73 additions and 73 deletions
|
|
@ -442,7 +442,7 @@ bool FillBlock(const CBlockIndex* index, const FoundBlock& block, UniqueLock<Rec
|
|||
if (block.m_next_block) FillBlock(active[index->nHeight] == index ? active[index->nHeight + 1] : nullptr, *block.m_next_block, lock, active, blockman);
|
||||
if (block.m_data) {
|
||||
REVERSE_LOCK(lock);
|
||||
if (!blockman.ReadBlockFromDisk(*block.m_data, *index)) block.m_data->SetNull();
|
||||
if (!blockman.ReadBlock(*block.m_data, *index)) block.m_data->SetNull();
|
||||
}
|
||||
block.found = true;
|
||||
return true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue