plugin-bcli: added rpcwaittimeout

Changelog-None

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

Author: NishantBansal2003

cln-rpc/src/codec.rs

@@ -105,7 +105,6 @@ impl Decoder for JsonCodec {
 /// A codec that reads fully formed [crate::messages::JsonRpc]
 /// messages. Internally it uses the [JsonCodec] which itself is built
 /// on the [MultiLineCodec].
-#[allow(dead_code)]
 #[derive(Default)]
 pub(crate) struct JsonRpcCodec {
     inner: JsonCodec,

plugins/Makefile

@@ -192,7 +192,6 @@ PLUGIN_COMMON_OBJS :=				\
 	common/splice_script.o			\
 	common/setup.o				\
 	common/status_levels.o			\
-	common/timeout.o			\
 	common/utils.o				\
 	common/version.o			\
 	common/wireaddr.o			\

plugins/bcli.c

@@ -10,7 +10,6 @@
 #include <common/json_param.h>
 #include <common/json_stream.h>
 #include <common/memleak.h>
-#include <common/timeout.h>
 #include <errno.h>
 #include <plugins/libplugin.h>
 
@@ -102,7 +101,6 @@ static const char **gather_argsv(const tal_t *ctx, const char *cmd, va_list ap)
 	const char *arg;
 
 	args[0] = bitcoind->cli ? bitcoind->cli : chainparams->cli;
-
 	if (chainparams->cli_args)
 		add_arg(&args, chainparams->cli_args);
 	if (bitcoind->datadir)
@@ -1035,23 +1033,14 @@ static void parse_getnetworkinfo_result(struct plugin *p, const char *buf)
 	tal_free(result);
 }
 
-static void log_warm_up(struct plugin *p)
-{
-	plugin_log(p, LOG_UNUSUAL, "Waiting for bitcoind to warm up...");
-}
-
 static void wait_and_check_bitcoind(struct plugin *p)
 {
 	int in, from, status;
 	pid_t child;
-	const char **cmd =
-	    gather_args(bitcoind, "-rpcwait", "getnetworkinfo", NULL);
+	const char **cmd = gather_args(
+	    bitcoind, "-rpcwait", "-rpcwaittimeout=30", "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)
@@ -1077,6 +1066,11 @@ static void wait_and_check_bitcoind(struct plugin *p)
 					    cmd[0], WTERMSIG(status)));
 
 	if (WEXITSTATUS(status) != 0) {
+		if (WEXITSTATUS(status) == 1)
+			bitcoind_failure(p,
+					 "RPC connection timed out. Could "
+					 "not connect to bitcoind using "
+					 "bitcoin-cli. Is bitcoind running?");
 		bitcoind_failure(p,
 				 tal_fmt(bitcoind, "%s exited with code %i: %s",
 					 cmd[0], WEXITSTATUS(status), output));