mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-02-22 14:22:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '0-18-4-branch-rc1-9084' into 0-18-4-branch-rc1

Browse source
This commit is contained in:
Oliver Gugger 2024-11-13 12:52:32 +01:00
commit 31ace742a5
No known key found for this signature in database
GPG key ID: 8E4256593F177720
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
discovery/syncer.go
View file

@ -835,12 +835,6 @@ func (g *GossipSyncer) processChanRangeReply(msg *lnwire.ReplyChannelRange) erro
} }
g.prevReplyChannelRange = msg g.prevReplyChannelRange = msg
if len(msg.Timestamps) != 0 &&
len(msg.Timestamps) != len(msg.ShortChanIDs) {
return fmt.Errorf("number of timestamps not equal to " +
"number of SCIDs")
}
for i, scid := range msg.ShortChanIDs { for i, scid := range msg.ShortChanIDs {
info := channeldb.NewChannelUpdateInfo( info := channeldb.NewChannelUpdateInfo(

6
lnwire/reply_channel_range.go
View file

@ -104,6 +104,12 @@ func (c *ReplyChannelRange) Decode(r io.Reader, pver uint32) error {
// Set the corresponding TLV types if they were included in the stream. // Set the corresponding TLV types if they were included in the stream.
if val, ok := typeMap[TimestampsRecordType]; ok && val == nil { if val, ok := typeMap[TimestampsRecordType]; ok && val == nil {
c.Timestamps = timeStamps c.Timestamps = timeStamps
// Check that a timestamp was provided for each SCID.
if len(c.Timestamps) != len(c.ShortChanIDs) {
return fmt.Errorf("number of timestamps does not " +
"match number of SCIDs")
}
} }
if len(tlvRecords) != 0 { if len(tlvRecords) != 0 {