diff --git a/discovery/gossiper.go b/discovery/gossiper.go index 4d583cc7..7cf973e9 100644 --- a/discovery/gossiper.go +++ b/discovery/gossiper.go @@ -1031,7 +1031,8 @@ func (d *AuthenticatedGossiper) networkHandler() { announcement.msg, ) if err != nil { - if err != routing.ErrVBarrierShuttingDown { + if err != routing.ErrVBarrierShuttingDown && + err != routing.ErrParentValidationFailed { log.Warnf("unexpected error "+ "during validation "+ "barrier shutdown: %v", @@ -1561,7 +1562,7 @@ func (d *AuthenticatedGossiper) processNetworkAnnouncement( routing.ErrIgnored) { log.Debug(err) - } else { + } else if err != routing.ErrVBarrierShuttingDown { log.Error(err) } @@ -2042,7 +2043,7 @@ func (d *AuthenticatedGossiper) processNetworkAnnouncement( if routing.IsError(err, routing.ErrOutdated, routing.ErrIgnored) { log.Debug(err) - } else { + } else if err != routing.ErrVBarrierShuttingDown { d.rejectMtx.Lock() d.recentRejects[msg.ShortChannelID.ToUint64()] = struct{}{} d.rejectMtx.Unlock() diff --git a/routing/router.go b/routing/router.go index 20f7ee0c..a609bff3 100644 --- a/routing/router.go +++ b/routing/router.go @@ -1038,12 +1038,19 @@ func (r *ChannelRouter) networkHandler() { update.msg, ) if err != nil { - if err != ErrVBarrierShuttingDown && - err != ErrParentValidationFailed { + switch err { + case ErrVBarrierShuttingDown: + update.err <- err + case ErrParentValidationFailed: + update.err <- newErrf( + ErrIgnored, err.Error(), + ) + default: log.Warnf("unexpected error "+ "during validation "+ "barrier shutdown: %v", err) + update.err <- err } return }