Merge #9760: [wallet] Remove importmulti always-true check

laanwj · laanwj · commit 2dad02232af1 · 2017-02-20T17:30:07.000+01:00
ec1267f [wallet] Remove importmulti always-true check (Russell Yanofsky)
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -1072,7 +1072,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)`
`1072`	`1072`	`}`
`1073`	`1073`	`}`
`1074`	`1074`
`1075`		`- if (fRescan && fRunScan && requests.size() && nLowestTimestamp <= chainActive.Tip()->GetBlockTimeMax()) {`
	`1075`	`+ if (fRescan && fRunScan && requests.size()) {`
`1076`	`1076`	`CBlockIndex* pindex = nLowestTimestamp > minimumTimestamp ? chainActive.FindEarliestAtLeast(std::max<int64_t>(nLowestTimestamp - 7200, 0)) : chainActive.Genesis();`
`1077`	`1077`
`1078`	`1078`	`if (pindex) {`