highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-03-26 01:33:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

multi: rename fundingLockedMsg to channelReadyMsg

Browse Source 
This commit is created by running,
```shell
gofmt -d -w -r 'fundingLockedMsg -> channelReadyMsg' .
```
This commit is contained in:
yyforyongyu 2023-03-16 05:00:17 +08:00
parent 112dc1faca
commit 539cae1999
No known key found for this signature in database
GPG Key ID: 9BCD95C4FF296868
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
funding/manager.go
View File

@ -2909,7 +2909,7 @@ func (f *Manager) sendChannelReady(completeChan *channeldb.OpenChannel,
if err != nil {
return fmt.Errorf("unable to create next revocation: %v", err)
}
fundingLockedMsg := lnwire.NewChannelReady(chanID, nextRevocation)
channelReadyMsg := lnwire.NewChannelReady(chanID, nextRevocation)
// If the channel negotiated the option-scid-alias feature bit, we'll
// send a TLV segment that includes an alias the peer can use in their
@ -2926,7 +2926,7 @@ func (f *Manager) sendChannelReady(completeChan *channeldb.OpenChannel,
// We can use a pointer to aliases since GetAliases returns a
// copy of the alias slice.
fundingLockedMsg.AliasScid = &aliases[0]
channelReadyMsg.AliasScid = &aliases[0]
}
// If the peer has disconnected before we reach this point, we will need
@ -2956,7 +2956,7 @@ func (f *Manager) sendChannelReady(completeChan *channeldb.OpenChannel,
// We could also refresh the channel state instead of checking
// whether the feature was negotiated, but this saves us a
// database read.
if fundingLockedMsg.AliasScid == nil && localAlias &&
if channelReadyMsg.AliasScid == nil && localAlias &&
remoteAlias {
// If an alias was not assigned above and the scid
@ -2983,16 +2983,16 @@ func (f *Manager) sendChannelReady(completeChan *channeldb.OpenChannel,
return err
}
fundingLockedMsg.AliasScid = &alias
channelReadyMsg.AliasScid = &alias
} else {
fundingLockedMsg.AliasScid = &aliases[0]
channelReadyMsg.AliasScid = &aliases[0]
}
}
log.Infof("Peer(%x) is online, sending FundingLocked "+
"for ChannelID(%v)", peerKey, chanID)
if err := peer.SendMessage(true, fundingLockedMsg); err == nil {
if err := peer.SendMessage(true, channelReadyMsg); err == nil {
// Sending succeeded, we can break out and continue the
// funding flow.
break
@ -3517,12 +3517,12 @@ func (f *Manager) handleChannelReady(peer lnpeer.Peer,
return
}
fundingLockedMsg := lnwire.NewChannelReady(
channelReadyMsg := lnwire.NewChannelReady(
chanID, secondPoint,
)
fundingLockedMsg.AliasScid = &alias
channelReadyMsg.AliasScid = &alias
err = peer.SendMessage(true, fundingLockedMsg)
err = peer.SendMessage(true, channelReadyMsg)
if err != nil {
log.Errorf("unable to send funding locked: %v",
err)

6
htlcswitch/link.go
View File

@ -734,7 +734,7 @@ func (l *channelLink) syncChanStates() error {
"revocation: %v", err)
}
fundingLockedMsg := lnwire.NewChannelReady(
channelReadyMsg := lnwire.NewChannelReady(
l.ChanID(), nextRevocation,
)
@ -756,10 +756,10 @@ func (l *channelLink) syncChanStates() error {
// getAliases returns a copy of the alias slice
// so it is ok to use a pointer to the first
// entry.
fundingLockedMsg.AliasScid = &aliases[0]
channelReadyMsg.AliasScid = &aliases[0]
}
err = l.cfg.Peer.SendMessage(false, fundingLockedMsg)
err = l.cfg.Peer.SendMessage(false, channelReadyMsg)
if err != nil {
return fmt.Errorf("unable to re-send "+
"FundingLocked: %v", err)

6
peer/brontide.go
View File

@ -746,12 +746,12 @@ func (p *Brontide) loadActiveChannels(chans []*channeldb.OpenChannel) (
return nil, err
}
fundingLockedMsg := lnwire.NewChannelReady(
channelReadyMsg := lnwire.NewChannelReady(
chanID, second,
)
fundingLockedMsg.AliasScid = &aliasScid
channelReadyMsg.AliasScid = &aliasScid
msgs = append(msgs, fundingLockedMsg)
msgs = append(msgs, channelReadyMsg)
}
// If we've negotiated the option-scid-alias feature