Merge c0e0e0a into merged_master (Elements PR #818)

ElementsProject · Nov 26, 2020 · 66204f0 · 66204f0
2 parents f4a783b + c0e0e0a
commit 66204f0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/init.cpp b/src/init.cpp
@@ -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

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -5505,6 +5505,7 @@ bool MainchainRPCCheck(const bool init)
 
     // Next, check for working and valid rpc
     if (gArgs.GetBoolArg("-validatepegin", Params().GetConsensus().has_parent_chain)) {
+        uiInterface.InitMessage(_("Awaiting mainchain RPC warmup").translated);
         // During init try until a non-RPC_IN_WARMUP result
         while (true) {
             try {