aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Yanofsky <[email protected]>2017-02-14 09:38:29 -0500
committerWladimir J. van der Laan <[email protected]>2017-02-20 17:30:26 +0100
commit40c754cb38cdc8bc27cfcfe3af8be869d4eab969 (patch)
treeb75967889845c9bc4338c7bb4f3d88e483bf4a7a
parentboost: remove iostreams includes (diff)
downloaddiscoin-40c754cb38cdc8bc27cfcfe3af8be869d4eab969.tar.xz
discoin-40c754cb38cdc8bc27cfcfe3af8be869d4eab969.zip
[wallet] Remove importmulti always-true check
Remove "nLowestTimestamp <= chainActive.Tip()->GetBlockTimeMax()" check from importmulti, which is always true because nLowestTimestamp is set to the minimum of the most recent block time and all the imported key timestamps, which is necessarily lower than the maximum block time. Github-Pull: #9760 Rebased-From: ec1267f13b7d0b9b5058c6821cf8dbf74e02d17c
-rw-r--r--src/wallet/rpcdump.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 30f241467..e95c71ac8 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -1072,7 +1072,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
}
}
- if (fRescan && fRunScan && requests.size() && nLowestTimestamp <= chainActive.Tip()->GetBlockTimeMax()) {
+ if (fRescan && fRunScan && requests.size()) {
CBlockIndex* pindex = nLowestTimestamp > minimumTimestamp ? chainActive.FindEarliestAtLeast(std::max<int64_t>(nLowestTimestamp - 7200, 0)) : chainActive.Genesis();
if (pindex) {