LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

refactor: Expose UndoReadFromDisk in header

Browse source
This commit is contained in:
MarcoFalke 2019-03-19 12:09:27 -04:00
parent 2c336a9ccd
commit fa11c036e9
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/validation.cpp
View file

@ -36,9 +36,9 @@
#include <txmempool.h> #include <txmempool.h>
#include <ui_interface.h> #include <ui_interface.h>
#include <undo.h> #include <undo.h>
#include <util/system.h>
#include <util/moneystr.h> #include <util/moneystr.h>
#include <util/strencodings.h> #include <util/strencodings.h>
#include <util/system.h>
#include <validationinterface.h> #include <validationinterface.h>
#include <warnings.h> #include <warnings.h>
@ -1455,9 +1455,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
return true; return true;
} }
namespace { static bool UndoWriteToDisk(const CBlockUndo& blockundo, FlatFilePos& pos, const uint256& hashBlock, const CMessageHeader::MessageStartChars& messageStart)
bool UndoWriteToDisk(const CBlockUndo& blockundo, FlatFilePos& pos, const uint256& hashBlock, const CMessageHeader::MessageStartChars& messageStart)
{ {
// Open history file to append // Open history file to append
CAutoFile fileout(OpenUndoFile(pos), SER_DISK, CLIENT_VERSION); CAutoFile fileout(OpenUndoFile(pos), SER_DISK, CLIENT_VERSION);
@ -1484,7 +1482,7 @@ bool UndoWriteToDisk(const CBlockUndo& blockundo, FlatFilePos& pos, const uint25
return true; return true;
} }
static bool UndoReadFromDisk(CBlockUndo& blockundo, const CBlockIndex *pindex) bool UndoReadFromDisk(CBlockUndo& blockundo, const CBlockIndex* pindex)
{ {
FlatFilePos pos = pindex->GetUndoPos(); FlatFilePos pos = pindex->GetUndoPos();
if (pos.IsNull()) { if (pos.IsNull()) {
@ -1533,8 +1531,6 @@ static bool AbortNode(CValidationState& state, const std::string& strMessage, co
return state.Error(strMessage); return state.Error(strMessage);
} }
} // namespace
/** /**
* Restore the UTXO in a Coin at a given COutPoint * Restore the UTXO in a Coin at a given COutPoint
* @param undo The Coin to be restored. * @param undo The Coin to be restored.

6
src/validation.h
View file

@ -21,6 +21,7 @@
#include <versionbits.h> #include <versionbits.h>
#include <algorithm> #include <algorithm>
#include <atomic>
#include <exception> #include <exception>
#include <map> #include <map>
#include <memory> #include <memory>
@ -30,10 +31,9 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <atomic>
class CBlockIndex; class CBlockIndex;
class CBlockTreeDB; class CBlockTreeDB;
class CBlockUndo;
class CChainParams; class CChainParams;
class CCoinsViewDB; class CCoinsViewDB;
class CInv; class CInv;
@ -391,6 +391,8 @@ bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex, const Consensus
bool ReadRawBlockFromDisk(std::vector<uint8_t>& block, const FlatFilePos& pos, const CMessageHeader::MessageStartChars& message_start); bool ReadRawBlockFromDisk(std::vector<uint8_t>& block, const FlatFilePos& pos, const CMessageHeader::MessageStartChars& message_start);
bool ReadRawBlockFromDisk(std::vector<uint8_t>& block, const CBlockIndex* pindex, const CMessageHeader::MessageStartChars& message_start); bool ReadRawBlockFromDisk(std::vector<uint8_t>& block, const CBlockIndex* pindex, const CMessageHeader::MessageStartChars& message_start);
bool UndoReadFromDisk(CBlockUndo& blockundo, const CBlockIndex* pindex);
/** Functions for validating blocks and updating the block tree */ /** Functions for validating blocks and updating the block tree */
/** Context-independent validity checks */ /** Context-independent validity checks */