multi: use lnwire.AnnouncementSigs interface throughout

Author: ellemouton

discovery/gossiper.go

@@ -1435,7 +1435,7 @@ func (d *AuthenticatedGossiper) networkHandler() {
 			switch announcement.msg.(type) {
 			// Channel announcement signatures are amongst the only
 			// messages that we'll process serially.
-			case *lnwire.AnnounceSignatures1:
+			case lnwire.AnnounceSignatures:
 				emittedAnnouncements, _ := d.processNetworkAnnouncement(
 					announcement,
 				)
@@ -2186,9 +2186,9 @@ func (d *AuthenticatedGossiper) fetchNodeAnn(
 // MessageStore is seen as stale by the current graph.
 func (d *AuthenticatedGossiper) isMsgStale(msg lnwire.Message) bool {
 	switch msg := msg.(type) {
-	case *lnwire.AnnounceSignatures1:
+	case lnwire.AnnounceSignatures:
 		chanInfo, _, _, err := d.cfg.Router.GetChannelByID(
-			msg.ShortChannelID,
+			msg.SCID(),
 		)
 
 		// If the channel cannot be found, it is most likely a leftover

discovery/message_store.go

@@ -83,8 +83,8 @@ func NewMessageStore(db kvdb.Backend) (*MessageStore, error) {
 func msgShortChanID(msg lnwire.Message) (lnwire.ShortChannelID, error) {
 	var shortChanID lnwire.ShortChannelID
 	switch msg := msg.(type) {
-	case *lnwire.AnnounceSignatures1:
-		shortChanID = msg.ShortChannelID
+	case lnwire.AnnounceSignatures:
+		shortChanID = msg.SCID()
 	case *lnwire.ChannelUpdate1:
 		shortChanID = msg.ShortChannelID
 	default:

funding/manager.go

@@ -4053,7 +4053,7 @@ func (f *Manager) ensureInitialForwardingPolicy(chanID lnwire.ChannelID,
 type chanAnnouncement struct {
 	chanAnn       lnwire.ChannelAnnouncement
 	chanUpdateAnn *lnwire.ChannelUpdate1
-	chanProof     *lnwire.AnnounceSignatures1
+	chanProof     lnwire.AnnounceSignatures
 }
 
 // newChanAnnouncement creates the authenticated channel announcement messages

peer/brontide.go

@@ -1715,6 +1715,7 @@ out:
 			*lnwire.ChannelAnnouncement2,
 			*lnwire.NodeAnnouncement1,
 			*lnwire.AnnounceSignatures1,
+			*lnwire.AnnounceSignatures2,
 			*lnwire.GossipTimestampRange,
 			*lnwire.QueryShortChanIDs,
 			*lnwire.QueryChannelRange,
@@ -1961,9 +1962,9 @@ func messageSummary(msg lnwire.Message) string {
 	case *lnwire.Error:
 		return fmt.Sprintf("%v", msg.Error())
 
-	case *lnwire.AnnounceSignatures1:
-		return fmt.Sprintf("chan_id=%v, short_chan_id=%v", msg.ChannelID,
-			msg.ShortChannelID.ToUint64())
+	case lnwire.AnnounceSignatures:
+		return fmt.Sprintf("chan_id=%v, short_chan_id=%v", msg.SCID(),
+			msg.SCID().ToUint64())
 
 	case lnwire.ChannelAnnouncement:
 		return fmt.Sprintf("chain_hash=%v, short_chan_id=%v",

routing/validation_barrier.go

@@ -154,7 +154,7 @@ func (v *ValidationBarrier) InitJobDependencies(job interface{}) {
 		return
 	case *channeldb.LightningNode:
 		return
-	case *lnwire.AnnounceSignatures1:
+	case lnwire.AnnounceSignatures:
 		// TODO(roasbeef): need to wait on chan ann?
 		return
 	}
@@ -216,7 +216,7 @@ func (v *ValidationBarrier) WaitForDependants(job interface{}) error {
 
 	// Other types of jobs can be executed immediately, so we'll just
 	// return directly.
-	case *lnwire.AnnounceSignatures1:
+	case lnwire.AnnounceSignatures:
 		// TODO(roasbeef): need to wait on chan ann?
 	case models.ChannelEdgeInfo:
 	case lnwire.ChannelAnnouncement:
@@ -302,7 +302,7 @@ func (v *ValidationBarrier) SignalDependants(job interface{}, allow bool) {
 	case models.ChannelEdgePolicy:
 		delete(v.chanEdgeDependencies, msg.SCID())
 
-	case *lnwire.AnnounceSignatures1:
+	case lnwire.AnnounceSignatures:
 		return
 	}
 }