diff options
| author | Russell Yanofsky <russ@yanofsky.org> | 2017-02-16 10:49:03 -0500 |
|---|---|---|
| committer | Russell Yanofsky <russ@yanofsky.org> | 2017-02-17 14:12:31 -0500 |
| commit | e2e2f4c856363bbb0e3b5ba4df225f3754c3db39 (patch) | |
| tree | 9e695fd32f65b1596f3ff613b96ec756bb2f1d2b /src/validation.cpp | |
| parent | 9828f9a9962c1bee5c343847030b9cfd87a40a5e (diff) | |
| download | bitcoin-e2e2f4c856363bbb0e3b5ba4df225f3754c3db39.tar.xz | |
Return errors from importmulti if complete rescans are not successful
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index 4ce0723b21..dbb42ab8c4 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -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); |