Enable p2p addresses in a single place

api/types.go

@@ -36,6 +36,9 @@ import (
 var logger = logging.Logger("apitypes")
 
 func init() {
+	// Use /p2p/ multiaddresses
+	multiaddr.SwapToP2pMultiaddrs()
+
 	// intialize trackerStatusString
 	stringTrackerStatus = make(map[string]TrackerStatus)
 	for k, v := range trackerStatusString {

cmd/ipfs-cluster-ctl/main.go

@@ -88,8 +88,6 @@ func checkErr(doing string, err error) {
 func main() {
 	ctx := context.Background()
 
-	ma.SwapToP2pMultiaddrs()
-
 	app := cli.NewApp()
 	app.Name = programName
 	app.Usage = "CLI for IPFS Cluster"

cmd/ipfs-cluster-service/daemon.go

@@ -52,8 +52,6 @@ func daemon(c *cli.Context) error {
 
 	logger.Info("Initializing. For verbose output run with \"-l debug\". Please wait...")
 
-	ma.SwapToP2pMultiaddrs()
-
 	ctx, cancel := context.WithCancel(context.Background())
 
 	bootstraps := parseBootstraps(c.StringSlice("bootstrap"))