channeld: remove never-used "reestablish_only" option.

This was always false.  peer_start_channeld was called in various places
with the argument "NULL" instead of "false", which unfortunately compilers
didn't complain about :(

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

channeld/channeld.c

@@ -4987,8 +4987,7 @@ static u8 *to_bytearr(const tal_t *ctx,
 }
 
 static void peer_reconnect(struct peer *peer,
-			   const struct secret *last_remote_per_commit_secret,
-			   bool reestablish_only)
+			   const struct secret *last_remote_per_commit_secret)
 {
 	struct channel_id channel_id;
 	/* Note: BOLT #2 uses these names! */
@@ -5146,14 +5145,6 @@ static void peer_reconnect(struct peer *peer,
 	do {
 		clean_tmpctx();
 		msg = peer_read(tmpctx, peer->pps);
-
-		/* connectd promised us the msg was reestablish? */
-		if (reestablish_only) {
-			if (fromwire_peektype(msg) != WIRE_CHANNEL_REESTABLISH)
-				status_failed(STATUS_FAIL_INTERNAL_ERROR,
-					      "Expected reestablish, got: %s",
-					      tal_hex(tmpctx, msg));
-		}
 	} while (handle_peer_error_or_warning(peer->pps, msg) ||
 		 capture_premature_msg(&premature_msgs, msg));
 
@@ -5501,23 +5492,6 @@ static void peer_reconnect(struct peer *peer,
 			set_channel_type(peer->channel, type);
 	}
 
-	/* Now stop, we've been polite long enough. */
-	if (reestablish_only) {
-		/* We've reestablished! */
-		wire_sync_write(MASTER_FD,
-				take(towire_channeld_reestablished(NULL)));
-
-		/* If we were successfully closing, we still go to closingd. */
-		if (shutdown_complete(peer)) {
-			send_shutdown_complete(peer);
-			daemon_shutdown();
-			exit(0);
-		}
-		peer_failed_err(peer->pps,
-				&peer->channel_id,
-				"Channel is already closed");
-	}
-
 	tal_free(send_tlvs);
 
 	/* We've reestablished! */
@@ -6103,7 +6077,6 @@ static void init_channel(struct peer *peer)
 	u32 minimum_depth, lease_expiry;
 	struct secret last_remote_per_commit_secret;
 	struct penalty_base *pbases;
-	bool reestablish_only;
 	struct channel_type *channel_type;
 
 	assert(!(fcntl(MASTER_FD, F_GETFL) & O_NONBLOCK));
@@ -6159,7 +6132,6 @@ static void init_channel(struct peer *peer)
 				    &channel_type,
 				    &peer->dev_disable_commit,
 				    &pbases,
-				    &reestablish_only,
 				    &peer->experimental_upgrade,
 				    &peer->splice_state->inflights,
 				    &peer->local_alias)) {
@@ -6249,10 +6221,7 @@ static void init_channel(struct peer *peer)
 
 	/* OK, now we can process peer messages. */
 	if (reconnected)
-		peer_reconnect(peer, &last_remote_per_commit_secret,
-			       reestablish_only);
-	else
-		assert(!reestablish_only);
+		peer_reconnect(peer, &last_remote_per_commit_secret);
 
 	/* If we have a messages to send, send them immediately */
 	if (fwd_msg)

channeld/channeld_wire.csv

@@ -72,7 +72,6 @@ msgdata,channeld_init,desired_type,channel_type,
 msgdata,channeld_init,dev_disable_commit,?u32,
 msgdata,channeld_init,num_penalty_bases,u32,
 msgdata,channeld_init,pbases,penalty_base,num_penalty_bases
-msgdata,channeld_init,reestablish_only,bool,
 msgdata,channeld_init,experimental_upgrade,bool,
 msgdata,channeld_init,num_inflights,u16,
 msgdata,channeld_init,inflights,inflight,num_inflights

lightningd/channel_control.c

@@ -363,7 +363,7 @@ static void handle_splice_abort(struct lightningd *ld,
 		return;
 	}
 
-	if (peer_start_channeld(channel, pfd, NULL, false, false)) {
+	if (peer_start_channeld(channel, pfd, NULL, false)) {
 		subd_send_msg(ld->connectd,
 			      take(towire_connectd_peer_connect_subd(NULL,
 			      					     &peer->id,
@@ -1641,8 +1641,7 @@ static void channel_control_errmsg(struct channel *channel,
 bool peer_start_channeld(struct channel *channel,
 			 struct peer_fd *peer_fd,
 			 const u8 *fwd_msg,
-			 bool reconnected,
-			 bool reestablish_only)
+			 bool reconnected)
 {
 	u8 *initmsg;
 	int hsmfd;
@@ -1865,7 +1864,6 @@ bool peer_start_channeld(struct channel *channel,
 					     ? NULL
 					     : (u32 *)&ld->dev_disable_commit,
 				       pbases,
-				       reestablish_only,
 				       ld->experimental_upgrade_protocol,
 				       cast_const2(const struct inflight **,
 						   inflights),

lightningd/channel_control.h

@@ -13,8 +13,7 @@ struct peer;
 bool peer_start_channeld(struct channel *channel,
 			 struct peer_fd *peer_fd,
 			 const u8 *fwd_msg,
-			 bool reconnected,
-			 bool reestablish_only);
+			 bool reconnected);
 
 /* Send message to channeld (if connected) to tell it about depth
  * c.f. dualopen_tell_depth! */

lightningd/dual_open_control.c

@@ -1990,7 +1990,7 @@ static void handle_channel_locked(struct subd *dualopend,
 	channel_watch_funding(dualopend->ld, channel);
 
 	/* FIXME: LND sigs/update_fee msgs? */
-	peer_start_channeld(channel, peer_fd, NULL, false, NULL);
+	peer_start_channeld(channel, peer_fd, NULL, false);
 	return;
 }
 

lightningd/opening_control.c

@@ -455,7 +455,7 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
 	tell_connectd_peer_importance(channel->peer, was_important);
 
 	/* If this fails, it cleans up */
-	if (!peer_start_channeld(channel, peer_fd, NULL, false, NULL))
+	if (!peer_start_channeld(channel, peer_fd, NULL, false))
 		return;
 
 	funding_success(channel);
@@ -562,7 +562,7 @@ static void opening_fundee_finished(struct subd *openingd,
 		wallet_penalty_base_add(ld->wallet, channel->dbid, pbase);
 
 	/* On to normal operation (frees if it fails!) */
-	if (peer_start_channeld(channel, peer_fd, fwd_msg, false, NULL))
+	if (peer_start_channeld(channel, peer_fd, fwd_msg, false))
 		tal_free(uc);
 	return;
 

lightningd/peer_control.c

@@ -1362,8 +1362,7 @@ static void connect_activate_subd(struct lightningd *ld, struct channel *channel
 
 		if (peer_start_channeld(channel,
 					pfd,
-					NULL, true,
-					NULL)) {
+					NULL, true)) {
 			goto tell_connectd;
 		}
 		close(other_fd);
@@ -1879,8 +1878,7 @@ void peer_spoke(struct lightningd *ld, const u8 *msg)
 				/* Tell channeld to handle reestablish, then it will call closingd */
 				if (peer_start_channeld(channel,
 							pfd,
-							NULL, true,
-							NULL)) {
+							NULL, true)) {
 					goto tell_connectd;
 				}
 				error = towire_warningfmt(tmpctx, &channel_id,

lightningd/test/run-invoice-select-inchan.c

@@ -904,8 +904,7 @@ bool peer_restart_dualopend(struct peer *peer UNNEEDED,
 bool peer_start_channeld(struct channel *channel UNNEEDED,
 			 struct peer_fd *peer_fd UNNEEDED,
 			 const u8 *fwd_msg UNNEEDED,
-			 bool reconnected UNNEEDED,
-			 bool reestablish_only UNNEEDED)
+			 bool reconnected UNNEEDED)
 { fprintf(stderr, "peer_start_channeld called!\n"); abort(); }
 /* Generated stub for peer_start_dualopend */
 bool peer_start_dualopend(struct peer *peer UNNEEDED, struct peer_fd *peer_fd UNNEEDED,

tests/plugins/channeld_fakenet.c

@@ -1057,7 +1057,6 @@ static struct channel *handle_init(struct info *info, const u8 *init_msg)
 	u32 minimum_depth, lease_expiry;
 	struct secret last_remote_per_commit_secret;
 	struct penalty_base *pbases;
-	bool reestablish_only;
 	struct channel_type *channel_type;
 	u32 feerate_min, feerate_max, feerate_penalty;
 	struct pubkey remote_per_commit;
@@ -1137,7 +1136,6 @@ static struct channel *handle_init(struct info *info, const u8 *init_msg)
 				    &channel_type,
 				    &dev_disable_commit,
 				    &pbases,
-				    &reestablish_only,
 				    &experimental_upgrade,
 				    &inflights,
 				    &local_alias))

wallet/test/run-wallet.c

@@ -940,8 +940,7 @@ bool peer_restart_dualopend(struct peer *peer UNNEEDED,
 bool peer_start_channeld(struct channel *channel UNNEEDED,
 			 struct peer_fd *peer_fd UNNEEDED,
 			 const u8 *fwd_msg UNNEEDED,
-			 bool reconnected UNNEEDED,
-			 bool reestablish_only UNNEEDED)
+			 bool reconnected UNNEEDED)
 { fprintf(stderr, "peer_start_channeld called!\n"); abort(); }
 /* Generated stub for peer_start_dualopend */
 bool peer_start_dualopend(struct peer *peer UNNEEDED, struct peer_fd *peer_fd UNNEEDED,