delme: test commit for CI

Author: ddustin

channeld/channeld.c

@@ -3598,11 +3598,14 @@ static void resume_splice_negotiation(struct peer *peer,
 					 &peer->channel->funding_pubkey[REMOTE],
 					 splice_funding_index);
 
+	status_info("Splicing signing.1");
 	msg = hsm_req(tmpctx, take(msg));
+	status_info("Splicing signing.2");
 	if (!fromwire_hsmd_sign_tx_reply(msg, &splice_sig))
 		status_failed(STATUS_FAIL_HSM_IO,
 			      "Reading sign_splice_tx reply: %s",
 			      tal_hex(tmpctx, msg));
+	status_info("Splicing signing.3");
 
 	/* Set the splice_sig on the splice funding tx psbt */
 	if (send_signature
@@ -3620,20 +3623,28 @@ static void resume_splice_negotiation(struct peer *peer,
 					 &peer->channel->funding_pubkey[LOCAL]),
 			      fmt_bitcoin_signature(tmpctx, &splice_sig),
 			      fmt_wally_psbt(tmpctx, current_psbt));
+	status_info("Splicing signing.4");
 
 	txsig_tlvs = tlv_txsigs_tlvs_new(tmpctx);
 	txsig_tlvs->shared_input_signature = &splice_sig.s;
 
+	status_info("Splicing signing.5");
+
 	/* DTODO: is this finalize call required? */
 	psbt_finalize(current_psbt);
 
+	status_info("Splicing signing.6");
+
 	outws = psbt_to_witnesses(tmpctx, current_psbt,
 				  our_role, splice_funding_index);
+	status_info("Splicing signing.7");
 	sigmsg = towire_tx_signatures(tmpctx, &peer->channel_id,
 				      &inflight->outpoint.txid, outws,
 				      txsig_tlvs);
+	status_info("Splicing signing.8");
 
 	psbt_txid(tmpctx, current_psbt, &final_txid, NULL);
+	status_info("Splicing signing.9");
 
 	if (do_i_sign_first(peer, current_psbt, our_role,
 			    inflight->force_sign_first)
@@ -3650,6 +3661,7 @@ static void resume_splice_negotiation(struct peer *peer,
 
 		peer_write(peer->pps, sigmsg);
 	}
+	status_info("Splicing signing.10");
 
 	their_pubkey = &peer->channel->funding_pubkey[REMOTE];
 
@@ -3741,6 +3753,7 @@ static void resume_splice_negotiation(struct peer *peer,
 				      fmt_wally_psbt(tmpctx, current_psbt));
 		}
 	}
+	status_info("Splicing signing.11");
 
 	if (have_i_signed_inflight(peer, inflight)
 		&& have_they_signed_inflight(peer, inflight)) {
@@ -3835,6 +3848,7 @@ static void resume_splice_negotiation(struct peer *peer,
 		bitcoin_tx_input_set_witness(final_tx, splice_funding_index,
 					     wit_stack);
 	}
+	status_info("Splicing signing.12");
 
 	if (recv_signature) {
 		/* We let core validate our peer's signatures are correct. */
@@ -3844,6 +3858,7 @@ static void resume_splice_negotiation(struct peer *peer,
 						      send_signature || inflight->i_sent_sigs);
 		wire_sync_write(MASTER_FD, take(msg));
 	}
+	status_info("Splicing signing.13");
 
 	if (!do_i_sign_first(peer, current_psbt, our_role,
 			     inflight->force_sign_first)
@@ -3855,6 +3870,7 @@ static void resume_splice_negotiation(struct peer *peer,
 		peer_write(peer->pps, sigmsg);
 		status_debug("Splice: we signed second");
 	}
+	status_info("Splicing signing.14");
 
 	if (send_signature) {
 		if (!recv_signature)
@@ -3867,6 +3883,7 @@ static void resume_splice_negotiation(struct peer *peer,
 							      new_output_index);
 		wire_sync_write(MASTER_FD, take(msg));
 	}
+	status_info("Splicing signing.15");
 
 	audit_psbt(current_psbt, current_psbt);
 }

connectd/multiplex.c

@@ -579,7 +579,7 @@ static void send_ping(struct peer *peer)
 	 * That's OK, ping is just to make sure it's still alive, and clearly
 	 * it is. */
 	if (time_before(peer->last_recv_time,
-			timeabs_sub(tnow, time_from_sec(60)))) {
+			timeabs_sub(tnow, time_from_sec(120)))) {
 		/* Already have a ping in flight? */
 		if (peer->expecting_pong != PONG_UNEXPECTED) {
 			status_peer_debug(&peer->id, "Last ping unreturned:"

tests/test_connection.py

@@ -4216,9 +4216,9 @@ def test_ping_timeout(node_factory):
                                               'dev-force-features': -7}])
     l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
 
-    # Ping timers runs at 15-45 seconds, *but* only fires if also 60 seconds
+    # Ping timers runs at 15-45 seconds, *but* only fires if also 120 seconds
     # after previous traffic.
-    l1.daemon.wait_for_log('dev_disconnect: xWIRE_PING', timeout=60 + 45 + 5)
+    l1.daemon.wait_for_log('dev_disconnect: xWIRE_PING', timeout=120 + 45 + 5)
 
     # Next pign will cause hangup
     l1.daemon.wait_for_log('Last ping unreturned: hanging up', timeout=45 + 5)