mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-08 10:31:50 -05:00
Merge bitcoin/bitcoin#28691: refactor: Remove CBlockFileInfo::SetNull
fac36b94ef
refactor: Remove CBlockFileInfo::SetNull (MarcoFalke) Pull request description: Seems better to use C++11 member initializers and then let the compiler figure out how to construct objects of this class. ACKs for top commit: stickies-v: ACKfac36b94ef
pablomartin4btc: ACKfac36b94ef
theStack: LGTM ACKfac36b94ef
Tree-SHA512: aee741c8f668f0e5b658fc83f4ebd196b43fead3dd437afdb0a2dafe092ae3d559332b3d9d61985c92e1a59982d8f24942606e6a98598c6ef7ff43697e858725
This commit is contained in:
commit
f4e96c29a6
3 changed files with 9 additions and 24 deletions
30
src/chain.h
30
src/chain.h
|
@ -42,13 +42,13 @@ static constexpr int64_t MAX_BLOCK_TIME_GAP = 90 * 60;
|
||||||
class CBlockFileInfo
|
class CBlockFileInfo
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
unsigned int nBlocks; //!< number of blocks stored in file
|
unsigned int nBlocks{}; //!< number of blocks stored in file
|
||||||
unsigned int nSize; //!< number of used bytes of block file
|
unsigned int nSize{}; //!< number of used bytes of block file
|
||||||
unsigned int nUndoSize; //!< number of used bytes in the undo file
|
unsigned int nUndoSize{}; //!< number of used bytes in the undo file
|
||||||
unsigned int nHeightFirst; //!< lowest height of block in file
|
unsigned int nHeightFirst{}; //!< lowest height of block in file
|
||||||
unsigned int nHeightLast; //!< highest height of block in file
|
unsigned int nHeightLast{}; //!< highest height of block in file
|
||||||
uint64_t nTimeFirst; //!< earliest time of block in file
|
uint64_t nTimeFirst{}; //!< earliest time of block in file
|
||||||
uint64_t nTimeLast; //!< latest time of block in file
|
uint64_t nTimeLast{}; //!< latest time of block in file
|
||||||
|
|
||||||
SERIALIZE_METHODS(CBlockFileInfo, obj)
|
SERIALIZE_METHODS(CBlockFileInfo, obj)
|
||||||
{
|
{
|
||||||
|
@ -61,21 +61,7 @@ public:
|
||||||
READWRITE(VARINT(obj.nTimeLast));
|
READWRITE(VARINT(obj.nTimeLast));
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetNull()
|
CBlockFileInfo() {}
|
||||||
{
|
|
||||||
nBlocks = 0;
|
|
||||||
nSize = 0;
|
|
||||||
nUndoSize = 0;
|
|
||||||
nHeightFirst = 0;
|
|
||||||
nHeightLast = 0;
|
|
||||||
nTimeFirst = 0;
|
|
||||||
nTimeLast = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
CBlockFileInfo()
|
|
||||||
{
|
|
||||||
SetNull();
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string ToString() const;
|
std::string ToString() const;
|
||||||
|
|
||||||
|
|
|
@ -254,7 +254,7 @@ void BlockManager::PruneOneBlockFile(const int fileNumber)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_blockfile_info[fileNumber].SetNull();
|
m_blockfile_info.at(fileNumber) = CBlockFileInfo{};
|
||||||
m_dirty_fileinfo.insert(fileNumber);
|
m_dirty_fileinfo.insert(fileNumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,6 @@
|
||||||
class BlockValidationState;
|
class BlockValidationState;
|
||||||
class CAutoFile;
|
class CAutoFile;
|
||||||
class CBlock;
|
class CBlock;
|
||||||
class CBlockFileInfo;
|
|
||||||
class CBlockUndo;
|
class CBlockUndo;
|
||||||
class CChainParams;
|
class CChainParams;
|
||||||
class Chainstate;
|
class Chainstate;
|
||||||
|
|
Loading…
Add table
Reference in a new issue