diff options
| author | Russell Yanofsky <russ@yanofsky.org> | 2017-02-14 09:38:29 -0500 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-02-20 17:30:26 +0100 |
| commit | 40c754cb38cdc8bc27cfcfe3af8be869d4eab969 (patch) | |
| tree | b75967889845c9bc4338c7bb4f3d88e483bf4a7a | |
| parent | 2afefeade6e668cab0643a5c22ff203ce1e509b0 (diff) | |
| download | bitcoin-40c754cb38cdc8bc27cfcfe3af8be869d4eab969.tar.xz | |
[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.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 30f2414675..e95c71ac8a 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) { |