use a global variable for default relays

vyzo · Stebalien · commit ce4904436e65 · 2020-01-17T12:02:23.000-08:00
and rename DefaultRelays option to DefaultStaticRelays.
diff --git a/options.go b/options.go
@@ -9,6 +9,7 @@ import (
 
 	config "github.com/libp2p/go-libp2p/config"
 	bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
+	autorelay "github.com/libp2p/go-libp2p/p2p/host/relay"
 
 	circuit "github.com/libp2p/go-libp2p-circuit"
 	crypto "github.com/libp2p/go-libp2p-crypto"
@@ -249,19 +250,15 @@ func EnableAutoRelay() Option {
 // discover relays
 func StaticRelays(relays []pstore.PeerInfo) Option {
 	return func(cfg *Config) error {
-		cfg.StaticRelays = relays
+		cfg.StaticRelays = append(cfg.StaticRelays, relays...)
 		return nil
 	}
 }
 
-// DefaultRelays configures the static relays to use the known PL-operated relays
-func DefaultRelays() Option {
+// DefaultStaticRelays configures the static relays to use the known PL-operated relays
+func DefaultStaticRelays() Option {
 	return func(cfg *Config) error {
-		for _, addr := range []string{
-			"/ip4/147.75.80.110/tcp/4001/p2p/QmbFgm5zan8P6eWWmeyfncR5feYEMPbht5b1FW1C37aQ7y",
-			"/ip4/147.75.195.153/tcp/4001/p2p/QmW9m57aiBDHAkKj9nmFSEn7ZqrcF1fZS4bipsTCHburei",
-			"/ip4/147.75.70.221/tcp/4001/p2p/Qme8g49gm3q4Acp7xWBKg3nAa9fxZ1YmyDJdyGgoG6LsXh",
-		} {
+		for _, addr := range autorelay.DefaultRelays {
 			a, err := ma.NewMultiaddr(addr)
 			if err != nil {
 				return err
diff --git a/p2p/host/relay/autorelay.go b/p2p/host/relay/autorelay.go
@@ -30,6 +30,13 @@ var (
 	BootDelay = 20 * time.Second
 )
 
+// These are the known PL-operated relays
+var DefaultRelays = []string{
+	"/ip4/147.75.80.110/tcp/4001/p2p/QmbFgm5zan8P6eWWmeyfncR5feYEMPbht5b1FW1C37aQ7y",
+	"/ip4/147.75.195.153/tcp/4001/p2p/QmW9m57aiBDHAkKj9nmFSEn7ZqrcF1fZS4bipsTCHburei",
+	"/ip4/147.75.70.221/tcp/4001/p2p/Qme8g49gm3q4Acp7xWBKg3nAa9fxZ1YmyDJdyGgoG6LsXh",
+}
+
 // AutoRelay is a Host that uses relays for connectivity when a NAT is detected.
 type AutoRelay struct {
 	host     *basic.BasicHost
