netann: let ValidateChannelAnn take the new interface

This commit is contained in:
Elle Mouton
2024-09-11 12:37:23 +02:00
parent 34e9ee1ee5
commit 35d0c61c12
2 changed files with 23 additions and 5 deletions

View File

@@ -1890,7 +1890,7 @@ func (d *AuthenticatedGossiper) processRejectedEdge(
if err != nil {
return nil, err
}
err = netann.ValidateChannelAnn(chanAnn)
err = netann.ValidateChannelAnn(chanAnn, d.fetchPKScript)
if err != nil {
err := fmt.Errorf("assembled channel announcement proof "+
"for shortChanID=%v isn't valid: %v",
@@ -2540,7 +2540,8 @@ func (d *AuthenticatedGossiper) handleChanAnnouncement(nMsg *networkMsg,
// the signatures within the proof as it should be well formed.
var proof *models.ChannelAuthProof
if nMsg.isRemote {
if err := netann.ValidateChannelAnn(ann); err != nil {
err := netann.ValidateChannelAnn(ann, d.fetchPKScript)
if err != nil {
err := fmt.Errorf("unable to validate announcement: "+
"%v", err)
@@ -3434,7 +3435,8 @@ func (d *AuthenticatedGossiper) handleAnnSig(nMsg *networkMsg,
// With all the necessary components assembled validate the full
// channel announcement proof.
if err := netann.ValidateChannelAnn(chanAnn); err != nil {
err = netann.ValidateChannelAnn(chanAnn, d.fetchPKScript)
if err != nil {
err := fmt.Errorf("channel announcement proof for "+
"short_chan_id=%v isn't valid: %v", shortChanID, err)