Adjust multiaddress types

api/pinsvcapi/pinsvc/pinsvc.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/ipfs/go-cid"
-	"github.com/multiformats/go-multiaddr"
+	types "github.com/ipfs/ipfs-cluster/api"
 )
 
 func init() {
@@ -34,10 +34,10 @@ func (apiErr APIError) Error() string {
 
 // Pin contains basic information about a Pin and pinning options.
 type Pin struct {
-	Cid     cid.Cid               `json:"cid"`
-	Name    string                `json:"name"`
-	Origins []multiaddr.Multiaddr `json:"origins"`
-	Meta    map[string]string     `json:"meta"`
+	Cid     cid.Cid           `json:"cid"`
+	Name    string            `json:"name"`
+	Origins []types.Multiaddr `json:"origins"`
+	Meta    map[string]string `json:"meta"`
 }
 
 type Status int
@@ -125,12 +125,12 @@ func StatusFromString(str string) Status {
 
 // PinStatus provides information about a Pin stored by the Pinning API.
 type PinStatus struct {
-	RequestID string                `json:"request_id"`
-	Status    Status                `json:"status"`
-	Created   time.Time             `json:"created"`
-	Pin       Pin                   `json:"pin"`
-	Delegates []multiaddr.Multiaddr `json:"delegates"`
-	Info      map[string]string     `json:"info"`
+	RequestID string            `json:"request_id"`
+	Status    Status            `json:"status"`
+	Created   time.Time         `json:"created"`
+	Pin       Pin               `json:"pin"`
+	Delegates []types.Multiaddr `json:"delegates"`
+	Info      map[string]string `json:"info"`
 }
 
 // PinList is the result of a call to List pins

api/pinsvcapi/pinsvcapi.go

@@ -102,7 +102,7 @@ func globalPinInfoToSvcPinStatus(
 		Meta:    gpi.Metadata,
 	}
 
-	delegates := []multiaddr.Multiaddr{}
+	delegates := []types.Multiaddr{}
 	idMap := make(map[peer.ID]*types.ID)
 	for _, clusterID := range clusterIDs {
 		idMap[clusterID.ID] = clusterID
@@ -125,7 +125,7 @@ func globalPinInfoToSvcPinStatus(
 		}
 		for _, ma := range clid.IPFS.Addresses {
 			if madns.Matches(ma.Value()) { // a dns multiaddress: take it
-				delegates = append(delegates, ma.Value())
+				delegates = append(delegates, ma)
 				continue
 			}
 
@@ -146,7 +146,7 @@ func globalPinInfoToSvcPinStatus(
 			if !netip.IsGlobalUnicast() {
 				continue
 			}
-			delegates = append(delegates, ma.Value())
+			delegates = append(delegates, ma)
 		}
 		status.Delegates = delegates
 	}