highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-11 13:13:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge #9773: Return errors from importmulti if complete rescans are not successful

Browse Source 
e2e2f4c Return errors from importmulti if complete rescans are not successful (Russell Yanofsky)
This commit is contained in:
Wladimir J. van der Laan
2017-02-22 12:42:55 +01:00
parent a8c5751038 e2e2f4c856
commit ba7220b5e8
6 changed files with 114 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/validation.cpp
View File

@@ -3331,7 +3331,7 @@ void PruneOneBlockFile(const int fileNumber)
}
void UnlinkPrunedFiles(std::set<int>& setFilesToPrune)
void UnlinkPrunedFiles(const std::set<int>& setFilesToPrune)
{
for (std::set<int>::iterator it = setFilesToPrune.begin(); it != setFilesToPrune.end(); ++it) {
CDiskBlockPos pos(*it, 0);
@@ -4163,6 +4163,11 @@ std::string CBlockFileInfo::ToString() const
return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u...%u, time=%s...%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst), DateTimeStrFormat("%Y-%m-%d", nTimeLast));
}
CBlockFileInfo* GetBlockFileInfo(size_t n)
{
return &vinfoBlockFile.at(n);
}
ThresholdState VersionBitsTipState(const Consensus::Params& params, Consensus::DeploymentPos pos)
{
LOCK(cs_main);