Skip to content

Commit 6eb8f1f

Browse files
authored
Merge pull request #9477 from ellemouton/graph2
discovery+graph: various preparations for moving funding tx validation to the gossiper
2 parents 6f312d4 + d025587 commit 6eb8f1f

File tree

7 files changed

+159
-108
lines changed

7 files changed

+159
-108
lines changed

discovery/gossiper.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2678,10 +2678,9 @@ func (d *AuthenticatedGossiper) handleChanAnnouncement(nMsg *networkMsg,
26782678

26792679
return anns, true
26802680

2681-
case graph.IsError(
2682-
err, graph.ErrNoFundingTransaction,
2683-
graph.ErrInvalidFundingOutput,
2684-
):
2681+
case errors.Is(err, graph.ErrNoFundingTransaction),
2682+
errors.Is(err, graph.ErrInvalidFundingOutput):
2683+
26852684
key := newRejectCacheKey(
26862685
scid.ToUint64(),
26872686
sourceToPub(nMsg.source),
@@ -2695,7 +2694,7 @@ func (d *AuthenticatedGossiper) handleChanAnnouncement(nMsg *networkMsg,
26952694
d.banman.incrementBanScore(nMsg.peer.PubKey())
26962695
}
26972696

2698-
case graph.IsError(err, graph.ErrChannelSpent):
2697+
case errors.Is(err, graph.ErrChannelSpent):
26992698
key := newRejectCacheKey(
27002699
scid.ToUint64(),
27012700
sourceToPub(nMsg.source),

0 commit comments

Comments
 (0)