Merge 97aadf98d0 into merged_master (Bitcoin PR #16117)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:07:50 +00:00
commit cc668250eb
17 changed files with 22 additions and 105 deletions

View file

@ -5517,7 +5517,7 @@ bool MainchainRPCCheck(const bool init)
// warmup; in that case, just wait and retry.
// If this is not the initial call, just report failure.
if (init && error["code"].get_int() == RPC_IN_WARMUP) {
MilliSleep(1000);
UninterruptibleSleep(std::chrono::milliseconds{1000});
continue;
}
else {