diff --git a/channeldb/graph_test.go b/channeldb/graph_test.go index 35c7050eb..0afc9ea19 100644 --- a/channeldb/graph_test.go +++ b/channeldb/graph_test.go @@ -2924,7 +2924,7 @@ func TestEdgePolicyMissingMaxHtcl(t *testing.T) { // Set the max_htlc field. The extra bytes added to the serialization // will be the opaque data containing the serialized field. - edge1.MessageFlags = lnwire.ChanUpdateOptionMaxHtlc + edge1.MessageFlags = lnwire.ChanUpdateRequiredMaxHtlc edge1.MaxHTLC = 13928598 var b2 bytes.Buffer err = serializeChanEdgePolicy(&b2, edge1, to) diff --git a/channeldb/migration/lnwire21/channel_update.go b/channeldb/migration/lnwire21/channel_update.go index 037f3d556..6d19e3e4c 100644 --- a/channeldb/migration/lnwire21/channel_update.go +++ b/channeldb/migration/lnwire21/channel_update.go @@ -14,9 +14,9 @@ import ( type ChanUpdateMsgFlags uint8 const ( - // ChanUpdateOptionMaxHtlc is a bit that indicates whether the + // ChanUpdateRequiredMaxHtlc is a bit that indicates whether the // optional htlc_maximum_msat field is present in this ChannelUpdate. - ChanUpdateOptionMaxHtlc ChanUpdateMsgFlags = 1 << iota + ChanUpdateRequiredMaxHtlc ChanUpdateMsgFlags = 1 << iota ) // String returns the bitfield flags as a string. @@ -27,7 +27,7 @@ func (c ChanUpdateMsgFlags) String() string { // HasMaxHtlc returns true if the htlc_maximum_msat option bit is set in the // message flags. func (c ChanUpdateMsgFlags) HasMaxHtlc() bool { - return c&ChanUpdateOptionMaxHtlc != 0 + return c&ChanUpdateRequiredMaxHtlc != 0 } // ChanUpdateChanFlags is a bitfield that signals various options concerning a diff --git a/discovery/gossiper.go b/discovery/gossiper.go index eb13d77ea..95886f6a5 100644 --- a/discovery/gossiper.go +++ b/discovery/gossiper.go @@ -1520,7 +1520,7 @@ func (d *AuthenticatedGossiper) retransmitStaleAnns(now time.Time) error { if !edge.MessageFlags.HasMaxHtlc() { // We'll make sure we support the new max_htlc field if // not already present. - edge.MessageFlags |= lnwire.ChanUpdateOptionMaxHtlc + edge.MessageFlags |= lnwire.ChanUpdateRequiredMaxHtlc edge.MaxHTLC = lnwire.NewMSatFromSatoshis(info.Capacity) edgesToUpdate = append(edgesToUpdate, updateTuple{ diff --git a/discovery/gossiper_test.go b/discovery/gossiper_test.go index 07a2b4bc0..db7e04842 100644 --- a/discovery/gossiper_test.go +++ b/discovery/gossiper_test.go @@ -582,7 +582,7 @@ func createUpdateAnnouncement(blockHeight uint32, BlockHeight: blockHeight, }, Timestamp: timestamp, - MessageFlags: lnwire.ChanUpdateOptionMaxHtlc, + MessageFlags: lnwire.ChanUpdateRequiredMaxHtlc, ChannelFlags: flags, TimeLockDelta: uint16(prand.Int63()), HtlcMinimumMsat: htlcMinMsat, diff --git a/funding/manager.go b/funding/manager.go index 80be2a67d..0f65e920e 100644 --- a/funding/manager.go +++ b/funding/manager.go @@ -3637,7 +3637,7 @@ func (f *Manager) newChanAnnouncement(localPubKey, // Our channel update message flags will signal that we support the // max_htlc field. - msgFlags := lnwire.ChanUpdateOptionMaxHtlc + msgFlags := lnwire.ChanUpdateRequiredMaxHtlc // We announce the channel with the default values. Some of // these values can later be changed by crafting a new ChannelUpdate. diff --git a/lnrpc/devrpc/dev_server.go b/lnrpc/devrpc/dev_server.go index d6b2f1f68..462328ea3 100644 --- a/lnrpc/devrpc/dev_server.go +++ b/lnrpc/devrpc/dev_server.go @@ -311,7 +311,8 @@ func (s *Server) ImportGraph(ctx context.Context, policy.MaxHTLC = lnwire.MilliSatoshi( rpcPolicy.MaxHtlcMsat, ) - policy.MessageFlags |= lnwire.ChanUpdateOptionMaxHtlc + policy.MessageFlags |= + lnwire.ChanUpdateRequiredMaxHtlc } return policy diff --git a/lnwire/channel_update.go b/lnwire/channel_update.go index 7881f972f..7f42a58b4 100644 --- a/lnwire/channel_update.go +++ b/lnwire/channel_update.go @@ -13,9 +13,9 @@ import ( type ChanUpdateMsgFlags uint8 const ( - // ChanUpdateOptionMaxHtlc is a bit that indicates whether the - // optional htlc_maximum_msat field is present in this ChannelUpdate. - ChanUpdateOptionMaxHtlc ChanUpdateMsgFlags = 1 << iota + // ChanUpdateRequiredMaxHtlc is a bit that indicates whether the + // required htlc_maximum_msat field is present in this ChannelUpdate. + ChanUpdateRequiredMaxHtlc ChanUpdateMsgFlags = 1 << iota ) // String returns the bitfield flags as a string. @@ -26,7 +26,7 @@ func (c ChanUpdateMsgFlags) String() string { // HasMaxHtlc returns true if the htlc_maximum_msat option bit is set in the // message flags. func (c ChanUpdateMsgFlags) HasMaxHtlc() bool { - return c&ChanUpdateOptionMaxHtlc != 0 + return c&ChanUpdateRequiredMaxHtlc != 0 } // ChanUpdateChanFlags is a bitfield that signals various options concerning a diff --git a/lnwire/lnwire_test.go b/lnwire/lnwire_test.go index 44d6cfb9b..96d0c8ae5 100644 --- a/lnwire/lnwire_test.go +++ b/lnwire/lnwire_test.go @@ -772,7 +772,7 @@ func TestLightningWireProtocol(t *testing.T) { // as being part of the ChannelUpdate, to pass // serialization tests, as it will be ignored if the bit // is not set. - if msgFlags&ChanUpdateOptionMaxHtlc == 0 { + if msgFlags&ChanUpdateRequiredMaxHtlc == 0 { maxHtlc = 0 } diff --git a/lnwire/message_test.go b/lnwire/message_test.go index f2b0892d7..090978a74 100644 --- a/lnwire/message_test.go +++ b/lnwire/message_test.go @@ -690,7 +690,7 @@ func newMsgChannelUpdate(t testing.TB, r *rand.Rand) *lnwire.ChannelUpdate { // as being part of the ChannelUpdate, to pass // serialization tests, as it will be ignored if the bit // is not set. - if msgFlags&lnwire.ChanUpdateOptionMaxHtlc == 0 { + if msgFlags&lnwire.ChanUpdateRequiredMaxHtlc == 0 { maxHtlc = 0 } diff --git a/routing/ann_validation.go b/routing/ann_validation.go index 6a84aa610..9231313ce 100644 --- a/routing/ann_validation.go +++ b/routing/ann_validation.go @@ -129,7 +129,7 @@ func ValidateNodeAnn(a *lnwire.NodeAnnouncement) error { func ValidateChannelUpdateAnn(pubKey *btcec.PublicKey, capacity btcutil.Amount, a *lnwire.ChannelUpdate) error { - if err := validateOptionalFields(capacity, a); err != nil { + if err := ValidateChannelUpdateFields(capacity, a); err != nil { return err } @@ -160,9 +160,9 @@ func VerifyChannelUpdateSignature(msg *lnwire.ChannelUpdate, return nil } -// validateOptionalFields validates a channel update's message flags and +// ValidateChannelUpdateFields validates a channel update's message flags and // corresponding update fields. -func validateOptionalFields(capacity btcutil.Amount, +func ValidateChannelUpdateFields(capacity btcutil.Amount, msg *lnwire.ChannelUpdate) error { if msg.MessageFlags.HasMaxHtlc() { diff --git a/routing/localchans/manager.go b/routing/localchans/manager.go index 4484d5f62..4cec09354 100644 --- a/routing/localchans/manager.go +++ b/routing/localchans/manager.go @@ -213,7 +213,7 @@ func (r *Manager) updateEdge(tx kvdb.RTx, chanPoint wire.OutPoint, } // If the MaxHtlc flag wasn't already set, we can set it now. - edge.MessageFlags |= lnwire.ChanUpdateOptionMaxHtlc + edge.MessageFlags |= lnwire.ChanUpdateRequiredMaxHtlc // Validate htlc amount constraints. switch { diff --git a/routing/localchans/manager_test.go b/routing/localchans/manager_test.go index 55bf97e71..94f4255ce 100644 --- a/routing/localchans/manager_test.go +++ b/routing/localchans/manager_test.go @@ -46,7 +46,7 @@ func TestManager(t *testing.T) { currentPolicy := channeldb.ChannelEdgePolicy{ MinHTLC: minHTLC, - MessageFlags: lnwire.ChanUpdateOptionMaxHtlc, + MessageFlags: lnwire.ChanUpdateRequiredMaxHtlc, } updateForwardingPolicies := func( diff --git a/routing/pathfind_test.go b/routing/pathfind_test.go index 3fb0dc9ce..4224a4f63 100644 --- a/routing/pathfind_test.go +++ b/routing/pathfind_test.go @@ -676,7 +676,7 @@ func createTestGraphFromChannels(t *testing.T, useCache bool, if node1.testChannelPolicy != nil { var msgFlags lnwire.ChanUpdateMsgFlags if node1.MaxHTLC != 0 { - msgFlags |= lnwire.ChanUpdateOptionMaxHtlc + msgFlags |= lnwire.ChanUpdateRequiredMaxHtlc } var channelFlags lnwire.ChanUpdateChanFlags if node1.Disabled { @@ -713,7 +713,7 @@ func createTestGraphFromChannels(t *testing.T, useCache bool, if node2.testChannelPolicy != nil { var msgFlags lnwire.ChanUpdateMsgFlags if node2.MaxHTLC != 0 { - msgFlags |= lnwire.ChanUpdateOptionMaxHtlc + msgFlags |= lnwire.ChanUpdateRequiredMaxHtlc } var channelFlags lnwire.ChanUpdateChanFlags if node2.Disabled { diff --git a/routing/unified_edges_test.go b/routing/unified_edges_test.go index 00a539034..752a79718 100644 --- a/routing/unified_edges_test.go +++ b/routing/unified_edges_test.go @@ -25,7 +25,7 @@ func TestNodeEdgeUnifier(t *testing.T) { FeeProportionalMillionths: 100000, FeeBaseMSat: 30, TimeLockDelta: 60, - MessageFlags: lnwire.ChanUpdateOptionMaxHtlc, + MessageFlags: lnwire.ChanUpdateRequiredMaxHtlc, MaxHTLC: 5000, MinHTLC: 100, } @@ -33,7 +33,7 @@ func TestNodeEdgeUnifier(t *testing.T) { FeeProportionalMillionths: 190000, FeeBaseMSat: 10, TimeLockDelta: 40, - MessageFlags: lnwire.ChanUpdateOptionMaxHtlc, + MessageFlags: lnwire.ChanUpdateRequiredMaxHtlc, MaxHTLC: 4000, MinHTLC: 100, }