Skip to content

Commit 02cbedc

Browse files
committed
Formatting: separate stfu msgs from splicing to its own group
1 parent e865e86 commit 02cbedc

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

fuzz/src/bin/gen_target.sh

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ GEN_TEST msg_tx_ack_rbf msg_targets::
7272
GEN_TEST msg_tx_abort msg_targets::
7373

7474
GEN_TEST msg_stfu msg_targets::
75+
7576
GEN_TEST msg_splice msg_targets::
7677
GEN_TEST msg_splice_ack msg_targets::
7778
GEN_TEST msg_splice_locked msg_targets::

fuzz/src/msg_targets/gen_target.sh

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ GEN_TEST lightning::ln::msgs::TxAckRbf test_msg_simple ""
6060
GEN_TEST lightning::ln::msgs::TxAbort test_msg_simple ""
6161

6262
GEN_TEST lightning::ln::msgs::Stfu test_msg_simple ""
63+
6364
GEN_TEST lightning::ln::msgs::Splice test_msg_simple ""
6465
GEN_TEST lightning::ln::msgs::SpliceAck test_msg_simple ""
6566
GEN_TEST lightning::ln::msgs::SpliceLocked test_msg_simple ""

lightning/src/ln/channelmanager.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -8523,7 +8523,7 @@ where
85238523

85248524
fn handle_stfu(&self, counterparty_node_id: &PublicKey, msg: &msgs::Stfu) {
85258525
let _: Result<(), _> = handle_error!(self, Err(MsgHandleErrInternal::send_err_msg_no_close(
8526-
"Splicing not supported".to_owned(),
8526+
"Quiescence not supported".to_owned(),
85278527
msg.channel_id.clone())), *counterparty_node_id);
85288528
}
85298529

@@ -8713,8 +8713,9 @@ where
87138713
// Common Channel Establishment
87148714
&events::MessageSendEvent::SendChannelReady { .. } => false,
87158715
&events::MessageSendEvent::SendAnnouncementSignatures { .. } => false,
8716-
// Splicing
8716+
// Quiescence
87178717
&events::MessageSendEvent::SendStfu { .. } => false,
8718+
// Splicing
87188719
&events::MessageSendEvent::SendSplice { .. } => false,
87198720
&events::MessageSendEvent::SendSpliceAck { .. } => false,
87208721
&events::MessageSendEvent::SendSpliceLocked { .. } => false,

lightning/src/ln/msgs.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ pub struct ChannelReady {
442442
}
443443

444444
/// An stfu (quiescence) message to be sent by or received from the stfu initiator.
445-
// TODO(splicing): Add spec link for `splice`; still in draft, using from https://github.com/lightning/bolts/pull/863
445+
// TODO(splicing): Add spec link for `stfu`; still in draft, using from https://github.com/lightning/bolts/pull/863
446446
#[derive(Clone, Debug, PartialEq, Eq)]
447447
pub struct Stfu {
448448
/// The channel ID where quiescence is intended
@@ -1463,9 +1463,11 @@ pub trait ChannelMessageHandler : MessageSendEventsProvider {
14631463
/// Handle an incoming `closing_signed` message from the given peer.
14641464
fn handle_closing_signed(&self, their_node_id: &PublicKey, msg: &ClosingSigned);
14651465

1466-
// Splicing
1466+
// Quiescence
14671467
/// Handle an incoming `stfu` message from the given peer.
14681468
fn handle_stfu(&self, their_node_id: &PublicKey, msg: &Stfu);
1469+
1470+
// Splicing
14691471
/// Handle an incoming `splice` message from the given peer.
14701472
fn handle_splice(&self, their_node_id: &PublicKey, msg: &Splice);
14711473
/// Handle an incoming `splice_ack` message from the given peer.

lightning/src/ln/peer_handler.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1655,10 +1655,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
16551655
self.message_handler.chan_handler.handle_channel_ready(&their_node_id, &msg);
16561656
},
16571657

1658-
// Splicing messages:
1658+
// Quiescence messages:
16591659
wire::Message::Stfu(msg) => {
16601660
self.message_handler.chan_handler.handle_stfu(&their_node_id, &msg);
16611661
}
1662+
1663+
// Splicing messages:
16621664
wire::Message::Splice(msg) => {
16631665
self.message_handler.chan_handler.handle_splice(&their_node_id, &msg);
16641666
}

0 commit comments

Comments
 (0)