Optimize GetOldestKeyPoolTime(), return as soon as we have both oldest keys

This commit is contained in:
Jonas Schnelli 2017-03-24 10:54:48 +01:00
parent 771a304ffe
commit ed79e4f497
No known key found for this signature in database
GPG key ID: 1EB776BB03C7922D

View file

@ -3069,12 +3069,18 @@ int64_t CWallet::GetOldestKeyPoolTime()
for(const int64_t& id : setKeyPool)
{
if (!walletdb.ReadPool(id, keypool))
if (!walletdb.ReadPool(id, keypool)) {
throw std::runtime_error(std::string(__func__) + ": read failed");
if (keypool.fInternal && keypool.nTime < oldest_internal)
}
if (keypool.fInternal && keypool.nTime < oldest_internal) {
oldest_internal = keypool.nTime;
else if (!keypool.fInternal && keypool.nTime < oldest_external)
}
else if (!keypool.fInternal && keypool.nTime < oldest_external) {
oldest_external = keypool.nTime;
}
if (oldest_internal != now && oldest_external != now) {
break;
}
}
return std::max(oldest_internal, oldest_external);
}