fixup! utils: fix SelectHopHints for lnd0.15.3

Author: sputn1ck

utils.go

@@ -111,23 +111,26 @@ func parseOutPoint(s string) (*wire.OutPoint, error) {
 	}, nil
 }
 
+// getAlias tries to get the ShortChannelId from the passed ChannelId and
+// aliasCache.
+func getAlias(aliasCache map[lnwire.ChannelID]lnwire.ShortChannelID,
+	channelID lnwire.ChannelID) (lnwire.ShortChannelID, error) {
+
+	if channelID, ok := aliasCache[channelID]; ok {
+		return channelID, nil
+	}
+
+	return lnwire.ShortChannelID{}, fmt.Errorf("can't find channelId")
+}
+
 // SelectHopHints calls into LND's exposed SelectHopHints prefiltered to the
 // includeNodes map (unless it's empty).
 func SelectHopHints(ctx context.Context, lnd *lndclient.LndServices,
 	amt btcutil.Amount, numMaxHophints int,
 	includeNodes map[route.Vertex]struct{}) ([][]zpay32.HopHint, error) {
 
-	cfg := &SelectHopHintsCfg{
-		IsPublicNode: func(pubKey [33]byte) (bool, error) {
-			return isPublicNode(ctx, lnd, pubKey)
-		},
-		FetchChannelEdgesByID: func(chanID uint64) (
-			*channeldb.ChannelEdgeInfo, *channeldb.ChannelEdgePolicy,
-			*channeldb.ChannelEdgePolicy, error) {
+	aliasCache := make(map[lnwire.ChannelID]lnwire.ShortChannelID)
 
-			return fetchChannelEdgesByID(ctx, lnd, chanID)
-		},
-	}
 	// Fetch all active and public channels.
 	channels, err := lnd.Client.ListChannels(ctx, false, false)
 	if err != nil {
@@ -164,6 +167,27 @@ func SelectHopHints(ctx context.Context, lnd *lndclient.LndServices,
 				ShortChannelID: channel.ChannelID,
 			},
 		)
+
+		channelID := lnwire.NewChanIDFromOutPoint(outPoint)
+		scID := lnwire.NewShortChanIDFromInt(channel.ChannelID)
+		aliasCache[channelID] = scID
+	}
+
+	cfg := &SelectHopHintsCfg{
+		IsPublicNode: func(pubKey [33]byte) (bool, error) {
+			return isPublicNode(ctx, lnd, pubKey)
+		},
+		FetchChannelEdgesByID: func(chanID uint64) (
+			*channeldb.ChannelEdgeInfo, *channeldb.ChannelEdgePolicy,
+			*channeldb.ChannelEdgePolicy, error) {
+
+			return fetchChannelEdgesByID(ctx, lnd, chanID)
+		},
+		GetAlias: func(id lnwire.ChannelID) (
+			lnwire.ShortChannelID, error) {
+
+			return getAlias(aliasCache, id)
+		},
 	}
 
 	routeHints := invoicesrpcSelectHopHints(