From 5d59ae0ba88849b1eb0d7350871bc19fcd5ef601 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Tue, 21 Dec 2021 17:42:28 +0100 Subject: [PATCH] Remove/inline ReadRawBlockFromDisk(block_data, pindex, message_start) --- src/net_processing.cpp | 2 +- src/node/blockstorage.cpp | 11 ----------- src/node/blockstorage.h | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/net_processing.cpp b/src/net_processing.cpp index bd51b0f7856..3cebca1a774 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1880,7 +1880,7 @@ void PeerManagerImpl::ProcessGetBlockData(CNode& pfrom, Peer& peer, const CInv& // Fast-path: in this case it is possible to serve the block directly from disk, // as the network format matches the format on disk std::vector block_data; - if (!ReadRawBlockFromDisk(block_data, pindex, m_chainparams.MessageStart())) { + if (!ReadRawBlockFromDisk(block_data, pindex->GetBlockPos(), m_chainparams.MessageStart())) { assert(!"cannot load block from disk"); } m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::BLOCK, Span{block_data})); diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp index 5f6bf535b30..62be9f9aac8 100644 --- a/src/node/blockstorage.cpp +++ b/src/node/blockstorage.cpp @@ -821,17 +821,6 @@ bool ReadRawBlockFromDisk(std::vector& block, const FlatFilePos& pos, c return true; } -bool ReadRawBlockFromDisk(std::vector& block, const CBlockIndex* pindex, const CMessageHeader::MessageStartChars& message_start) -{ - FlatFilePos block_pos; - { - LOCK(cs_main); - block_pos = pindex->GetBlockPos(); - } - - return ReadRawBlockFromDisk(block, block_pos, message_start); -} - /** Store block on disk. If dbp is non-nullptr, the file is known to already reside on disk */ FlatFilePos BlockManager::SaveBlockToDisk(const CBlock& block, int nHeight, CChain& active_chain, const CChainParams& chainparams, const FlatFilePos* dbp) { diff --git a/src/node/blockstorage.h b/src/node/blockstorage.h index d7c980af855..42e46797d2c 100644 --- a/src/node/blockstorage.h +++ b/src/node/blockstorage.h @@ -185,7 +185,6 @@ void UnlinkPrunedFiles(const std::set& setFilesToPrune); bool ReadBlockFromDisk(CBlock& block, const FlatFilePos& pos, const Consensus::Params& consensusParams); bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex, const Consensus::Params& consensusParams); bool ReadRawBlockFromDisk(std::vector& block, const FlatFilePos& pos, const CMessageHeader::MessageStartChars& message_start); -bool ReadRawBlockFromDisk(std::vector& block, const CBlockIndex* pindex, const CMessageHeader::MessageStartChars& message_start); bool UndoReadFromDisk(CBlockUndo& blockundo, const CBlockIndex* pindex);