Changed "warmstart" to "coldstart" (inverted semantic).

Author: ksedgwic

contrib/remote_hsmd/hsmd.c

@@ -360,7 +360,7 @@ static struct io_plan *init_hsm(struct io_conn *conn,
 	struct sha256 *force_channel_secrets_shaseed;
 	struct secret *hsm_encryption_key;
 	struct secret hsm_secret;
-	bool warmstart;
+	bool coldstart;
 
 	/* This must be lightningd. */
 	assert(is_lightningd(c));
@@ -408,10 +408,10 @@ static struct io_plan *init_hsm(struct io_conn *conn,
 	}
 
 	/* Is this a warm start (restart) or a cold start (first time)? */
-	warmstart = access("INITED", F_OK) != -1;
+	coldstart = access("WARM", F_OK) == -1;
 
 	proxy_stat rv = proxy_init_hsm(&bip32_key_version, chainparams,
-				       warmstart, &hsm_secret,
+				       coldstart, &hsm_secret,
 				       &node_id, &pubstuff.bip32);
 	if (PROXY_PERMANENT(rv)) {
 		status_failed(STATUS_FAIL_INTERNAL_ERROR,
@@ -427,7 +427,7 @@ static struct io_plan *init_hsm(struct io_conn *conn,
 	}
 
 	/* Mark this node as already inited. */
-	int fd = open("INITED", O_WRONLY|O_TRUNC|O_CREAT, 0666);
+	int fd = open("WARM", O_WRONLY|O_TRUNC|O_CREAT, 0666);
 	assert(fd != -1);
 	close(fd);
 

contrib/remote_hsmd/proxy.cc

@@ -323,16 +323,16 @@ void proxy_setup()
 
 proxy_stat proxy_init_hsm(struct bip32_key_version *bip32_key_version,
 			  struct chainparams const *chainparams,
-			  bool warmstart,
+			  bool coldstart,
 			  struct secret *hsm_secret,
 			  struct node_id *o_node_id,
 			  struct ext_key *o_ext_pubkey)
 {
 	status_debug(
-		"%s:%d %s hsm_secret=%s warmstart=%s",
+		"%s:%d %s hsm_secret=%s coldstart=%s",
 		__FILE__, __LINE__, __FUNCTION__,
 		dump_secret(hsm_secret).c_str(),
-		warmstart ? "true" : "false"
+		coldstart ? "true" : "false"
 		);
 
 	/* First we make the Init call to create the Node. */
@@ -343,7 +343,7 @@ proxy_stat proxy_init_hsm(struct bip32_key_version *bip32_key_version,
 		auto cp = req.mutable_chainparams();
 		cp->set_network_name(chainparams->network_name);
 
-		req.set_warmstart(warmstart);
+		req.set_coldstart(coldstart);
 
 		/* FIXME - Sending the secret instead of generating on
 		 * the remote. */

contrib/remote_hsmd/proxy.h

@@ -30,7 +30,7 @@ void proxy_setup(void);
 proxy_stat proxy_init_hsm(
 	struct bip32_key_version *bip32_key_version,
 	struct chainparams const *chainparams,
-	bool warmstart,
+	bool coldstart,
 	struct secret *hsm_secret,
 	struct node_id *o_node_id,
 	struct ext_key *o_ext_pub_key);