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

peer: use feature.ValidateRequired, cleanup error msgs

Browse Source
This commit is contained in:
Conner Fromknecht 2020-01-08 12:25:41 -08:00
parent b9b66419ff
commit 0f9023256e
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
peer.go
View File

@ -2460,7 +2460,7 @@ func (p *peer) handleInitMsg(msg *lnwire.Init) error {
// those presented in the local features fields. // those presented in the local features fields.
err := msg.Features.Merge(msg.GlobalFeatures) err := msg.Features.Merge(msg.GlobalFeatures)
if err != nil { if err != nil {
return fmt.Errorf("unable to merge legacy global featues: %v", return fmt.Errorf("unable to merge legacy global features: %v",
err) err)
} }
@ -2472,11 +2472,9 @@ func (p *peer) handleInitMsg(msg *lnwire.Init) error {
// Now that we have their features loaded, we'll ensure that they // Now that we have their features loaded, we'll ensure that they
// didn't set any required bits that we don't know of. // didn't set any required bits that we don't know of.
unknownFeatures := p.remoteFeatures.UnknownRequiredFeatures() err = feature.ValidateRequired(p.remoteFeatures)
if len(unknownFeatures) > 0 { if err != nil {
err := fmt.Errorf("peer set unknown feature bits: %v", return fmt.Errorf("invalid remote features: %v", err)
unknownFeatures)
return err
} }
// Ensure the remote party's feature vector contains all transistive // Ensure the remote party's feature vector contains all transistive
@ -2484,7 +2482,7 @@ func (p *peer) handleInitMsg(msg *lnwire.Init) error {
// during the feature manager's instantiation. // during the feature manager's instantiation.
err = feature.ValidateDeps(p.remoteFeatures) err = feature.ValidateDeps(p.remoteFeatures)
if err != nil { if err != nil {
return fmt.Errorf("peer set invalid feature vector: %v", err) return fmt.Errorf("invalid remote features: %v", err)
} }
// Now that we know we understand their requirements, we'll check to // Now that we know we understand their requirements, we'll check to