Merge c0e0e0a9d5 into merged_master (Elements PR #818)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:07:46 +00:00
commit 66204f061c
2 changed files with 1 additions and 1 deletions

View file

@ -1916,7 +1916,6 @@ bool AppInitMain(NodeContext& node)
SetRPCWarmupFinished();
// ELEMENTS:
uiInterface.InitMessage(_("Awaiting mainchain RPC warmup").translated);
if (!MainchainRPCCheck(true)) { //Initial check only
const std::string err_msg = "ERROR: elements is set to verify pegins but cannot get valid response from the mainchain daemon. Please check debug.log for more information.\n\nIf you haven't setup a bitcoind please get the latest stable version from https://bitcoincore.org/en/download/ or if you do not need to validate pegins set in your elements configuration validatepegin=0";
// We fail immediately if this node has RPC server enabled