rerun

Author: IbrahimAhmed8

api/network.go

@@ -23,7 +23,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/protocol"
 )
 
@@ -77,14 +76,6 @@ const (
 	TokenRefreshCheckInterval = 10 * time.Minute
 )
 
-func CanonicalPeerID(s string) (string, error) {
-	p, err := peer.Decode(s)
-	if err != nil {
-		return "", err
-	}
-	return p.String(), nil
-}
-
 // EnrollChallenge is the payload a bootstrap enrollee signs to prove
 // possession of the private half of BootstrapEnrollRequest.public_key at
 // POST /enroll, carried in that message's timestamp/challenge_signature

internal/controlplane/mesh.go

@@ -169,11 +169,11 @@ func canonicalPeerID(peerID string) string {
 	if peerID == "" {
 		return ""
 	}
-	canonical, err := api.CanonicalPeerID(peerID)
+	p, err := peer.Decode(peerID)
 	if err != nil {
 		return peerID
 	}
-	return canonical
+	return p.String()
 }
 
 func (p *P2PMeshAdapter) DiscoverServices(ctx context.Context, serviceType string) ([]*ServiceAnnouncement, error) {

internal/storage/peer_id_canonicalization_test.go

@@ -21,7 +21,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/sam/api"
 	libcrypto "github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/peer"
 )
@@ -373,23 +372,23 @@ func TestCanonicalPeerID(t *testing.T) {
 	id := newPeerID(t)
 	alias := aliasOf(t, id)
 
-	canonical, err := api.CanonicalPeerID(alias)
+	canonical, err := canonicalPeerID(alias)
 	if err != nil {
 		t.Fatalf("failed to canonicalize alias: %v", err)
 	}
 	if canonical != id.String() {
 		t.Errorf("canonical = %q, want %q", canonical, id.String())
 	}
 
-	canonical, err = api.CanonicalPeerID(id.String())
+	canonical, err = canonicalPeerID(id.String())
 	if err != nil {
 		t.Fatalf("failed to canonicalize canonical id: %v", err)
 	}
 	if canonical != id.String() {
 		t.Errorf("canonical form is not stable: %q", canonical)
 	}
 
-	if _, err := api.CanonicalPeerID("not-a-peer-id"); err == nil {
+	if _, err := canonicalPeerID("not-a-peer-id"); err == nil {
 		t.Error("expected an error for an undecodable peer id")
 	}
 }

internal/storage/sql_store.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/google/sam/api"
 	log "github.com/ipfs/go-log/v2"
+	"github.com/libp2p/go-libp2p/core/peer"
 
 	// Register PG and SQLite drivers
 	_ "github.com/jackc/pgx/v5/stdlib"
@@ -519,6 +520,14 @@ func (s *SQLStore) rebind(query string) string {
 	return result.String()
 }
 
+func canonicalPeerID(raw string) (string, error) {
+	p, err := peer.Decode(raw)
+	if err != nil {
+		return "", err
+	}
+	return p.String(), nil
+}
+
 func migrateCanonicalPeerIDs(ctx context.Context, s *SQLStore, tx *sql.Tx) error {
 	if err := canonicalizeNodePeerIDs(ctx, s, tx); err != nil {
 		return err
@@ -548,7 +557,7 @@ func canonicalizeNodePeerIDs(ctx context.Context, s *SQLStore, tx *sql.Tx) error
 		if err := rows.Scan(&r.rawPeerID, &r.banned); err != nil {
 			return fmt.Errorf("failed to scan node: %w", err)
 		}
-		canonical, err := api.CanonicalPeerID(r.rawPeerID)
+		canonical, err := canonicalPeerID(r.rawPeerID)
 		if err != nil {
 			logger.Warnw("Ignoring node with undecodable peer ID", "peer_id", r.rawPeerID)
 			continue
@@ -607,7 +616,7 @@ func canonicalizeEnrollmentRequestPeerIDs(ctx context.Context, s *SQLStore, tx *
 		if err := rows.Scan(&r.id, &r.rawPeerID, &r.createdAt); err != nil {
 			return fmt.Errorf("failed to scan enrollment request: %w", err)
 		}
-		canonical, err := api.CanonicalPeerID(r.rawPeerID)
+		canonical, err := canonicalPeerID(r.rawPeerID)
 		if err != nil {
 			logger.Warnw("Ignoring enrollment request with undecodable peer ID", "peer_id", r.rawPeerID)
 			continue
@@ -668,7 +677,7 @@ func canonicalizeRouterPeerIDs(ctx context.Context, s *SQLStore, tx *sql.Tx) err
 		if err := rows.Scan(&r.rawPeerID, &r.lastRenewal); err != nil {
 			return fmt.Errorf("failed to scan router: %w", err)
 		}
-		canonical, err := api.CanonicalPeerID(r.rawPeerID)
+		canonical, err := canonicalPeerID(r.rawPeerID)
 		if err != nil {
 			logger.Warnw("Ignoring router with undecodable peer ID", "peer_id", r.rawPeerID)
 			continue