From 8b2ade7ec905e37ad2a6ab1a3bb0af7cd54c0d29 Mon Sep 17 00:00:00 2001 From: yyforyongyu Date: Mon, 3 Mar 2025 10:00:38 +0800 Subject: [PATCH] lnwallet+protofsm: fix logging --- lnwallet/chancloser/rbf_coop_transitions.go | 7 ++++--- protofsm/state_machine.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lnwallet/chancloser/rbf_coop_transitions.go b/lnwallet/chancloser/rbf_coop_transitions.go index da45908b7..1c7612541 100644 --- a/lnwallet/chancloser/rbf_coop_transitions.go +++ b/lnwallet/chancloser/rbf_coop_transitions.go @@ -193,7 +193,8 @@ func (c *ChannelActive) ProcessEvent(event ProtocolEvent, env *Environment, // also emit similar events like the above to send out shutdown, and // also disable the channel. case *ShutdownReceived: - chancloserLog.Infof("ChannelPoint(%v): received shutdown msg") + chancloserLog.Infof("ChannelPoint(%v): received shutdown msg", + env.ChanPoint) // Validate that they can send the message now, and also that // they haven't violated their commitment to a prior upfront @@ -204,7 +205,7 @@ func (c *ChannelActive) ProcessEvent(event ProtocolEvent, env *Environment, ) if err != nil { chancloserLog.Errorf("ChannelPoint(%v): rejecting "+ - "shutdown attempt: %v", err) + "shutdown attempt: %v", env.ChanPoint, err) return nil, err } @@ -302,7 +303,7 @@ func (s *ShutdownPending) ProcessEvent(event ProtocolEvent, env *Environment, ) if err != nil { chancloserLog.Errorf("ChannelPoint(%v): rejecting "+ - "shutdown attempt: %v", err) + "shutdown attempt: %v", env.ChanPoint, err) return nil, err } diff --git a/protofsm/state_machine.go b/protofsm/state_machine.go index 0e0343587..4d0215b69 100644 --- a/protofsm/state_machine.go +++ b/protofsm/state_machine.go @@ -345,7 +345,7 @@ func (s *StateMachine[Event, Env]) executeDaemonEvent(ctx context.Context, // any preconditions as well as post-send events. case *SendMsgEvent[Event]: sendAndCleanUp := func() error { - s.log.DebugS(ctx, "Sending message to target", + s.log.DebugS(ctx, "Sending message:", btclog.Hex6("target", daemonEvent.TargetPeer.SerializeCompressed()), "messages", lnutils.SpewLogClosure(daemonEvent.Msgs))