plugin-bcli: addresses comments

Changelog-None

Signed-off-by: Nishant Bansal <[email protected]>

Author: NishantBansal2003

plugins/bcli.c

@@ -1042,12 +1042,16 @@ static void log_warm_up(struct plugin *p)
 
 static void wait_and_check_bitcoind(struct plugin *p)
 {
-	int in, from, status, ret;
+	int in, from, status;
 	pid_t child;
 	const char **cmd =
 	    gather_args(bitcoind, "-rpcwait", "getnetworkinfo", NULL);
 	char *output = NULL;
 
+	struct timers *timer = tal(cmd, struct timers);
+	timers_init(timer, time_mono());
+	new_reltimer(timer, timer, time_from_sec(30), log_warm_up, p);
+
 	child = pipecmdarr(&in, &from, &from, cast_const2(char **, cmd));
 
 	if (bitcoind->rpcpass)
@@ -1066,32 +1070,18 @@ static void wait_and_check_bitcoind(struct plugin *p)
 
 	output = grab_fd(cmd, from);
 
-	while ((ret = waitpid(child, &status, 0)) < 0 && errno == EINTR)
-		;
-	if (ret != child)
-		bitcoind_failure(p, tal_fmt(bitcoind, "Waiting for %s: %s",
-					    cmd[0], strerror(errno)));
+	waitpid(child, &status, 0);
+
 	if (!WIFEXITED(status))
 		bitcoind_failure(p, tal_fmt(bitcoind, "Death of %s: signal %i",
 					    cmd[0], WTERMSIG(status)));
 
-	/* bitcoin/src/rpc/protocol.h:
-	 *	RPC_IN_WARMUP = -28, //!< Client still warming up
-	 */
-	if (WEXITSTATUS(status) != 0 && WEXITSTATUS(status) != 28) {
-		if (WEXITSTATUS(status) == 1)
-			bitcoind_failure(p,
-					 "Could not connect to bitcoind using"
-					 " bitcoin-cli. Is bitcoind running?");
+	if (WEXITSTATUS(status) != 0) {
 		bitcoind_failure(p,
 				 tal_fmt(bitcoind, "%s exited with code %i: %s",
 					 cmd[0], WEXITSTATUS(status), output));
 	}
 
-	struct timers *timer = tal(cmd, struct timers);
-	timers_init(timer, time_mono());
-	new_reltimer(timer, timer, time_from_sec(30), log_warm_up, p);
-
 	parse_getnetworkinfo_result(p, output);
 
 	tal_free(cmd);