Fix wrong hardcoded default dmsg discovery (#271)

* change hardcoded dmsg discovery to use skywire-utilities/pkg/skyenv.DmsgDiscAddr
skycoin · Jul 2, 2024 · 1c2fcec · 1c2fcec
1 parent e8cd649
commit 1c2fcec
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/examples/dmsgcurl/dmsg-example-http-server/dmsg-example-http-server.go b/examples/dmsgcurl/dmsg-example-http-server/dmsg-example-http-server.go
@@ -12,14 +12,15 @@ import (
 	"github.com/skycoin/skywire-utilities/pkg/cipher"
 	"github.com/skycoin/skywire-utilities/pkg/cmdutil"
 	"github.com/skycoin/skywire-utilities/pkg/logging"
+	"github.com/skycoin/skywire-utilities/pkg/skyenv"
 
 	"github.com/skycoin/dmsg/pkg/disc"
 	dmsg "github.com/skycoin/dmsg/pkg/dmsg"
 )
 
 var (
 	dir      = "." // local dir to serve via http
-	dmsgDisc = "http://dmsgd.skywire.skycoin.com"
+	dmsgDisc = skyenv.DmsgDiscAddr
 	dmsgPort = uint(80)
 	pk, sk   = cipher.GenerateKeyPair()
 )

diff --git a/go.mod b/go.mod
@@ -72,4 +72,4 @@ require (
 
 // Uncomment for tests with alternate branches of 'skywire-utilities'
 // replace github.com/skycoin/skywire-utilities => ../skywire-utilities
-//replace github.com/skycoin/skywire-utilities => github.com/skycoin/skywire-utilities
+// replace github.com/skycoin/skywire-utilities => github.com/skycoin/skywire-utilities
diff --git a/pkg/dmsg/const.go b/pkg/dmsg/const.go
@@ -3,11 +3,13 @@ package dmsg
 
 import (
 	"time"
+
+	"github.com/skycoin/skywire-utilities/pkg/skyenv"
 )
 
 // Constants.
 const (
-	DefaultDiscAddr = "http://dmsgd.skywire.skycoin.com"
+	DefaultDiscAddr = skyenv.DmsgDiscAddr
 
 	DefaultMinSessions = 1
 

diff --git a/pkg/dmsgcurl/flags.go b/pkg/dmsgcurl/flags.go
@@ -5,6 +5,7 @@ import (
 	"flag"
 
 	"github.com/skycoin/skywire-utilities/pkg/buildinfo"
+	"github.com/skycoin/skywire-utilities/pkg/skyenv"
 )
 
 // ExecName contains the execution name.
@@ -38,7 +39,7 @@ type dmsgFlags struct {
 func (f *dmsgFlags) Name() string { return "Dmsg" }
 
 func (f *dmsgFlags) Init(fs *flag.FlagSet) {
-	fs.StringVar(&f.Disc, "dmsg-disc", "http://dmsgd.skywire.skycoin.com", "dmsg discovery `URL`")
+	fs.StringVar(&f.Disc, "dmsg-disc", skyenv.DmsgDiscAddr, "dmsg discovery `URL`")
 	fs.IntVar(&f.Sessions, "dmsg-sessions", 1, "connect to `NUMBER` of dmsg servers")
 }
 

diff --git a/pkg/dmsgserver/config.go b/pkg/dmsgserver/config.go
@@ -8,17 +8,18 @@ import (
 
 	"github.com/skycoin/skycoin/src/util/logging"
 	"github.com/skycoin/skywire-utilities/pkg/cipher"
+	"github.com/skycoin/skywire-utilities/pkg/skyenv"
 )
 
 const (
-	defaultDiscoveryURL  = "http://dmsgd.skywire.skycoin.com"
+	defaultDiscoveryURL  = skyenv.DmsgDiscAddr
 	defaultPublicAddress = "127.0.0.1:8081"
 	defaultLocalAddress  = ":8081"
 	defaultHTTPAddress   = ":8082"
 	// DefaultConfigPath default path of config file
 	DefaultConfigPath = "config.json"
 	// DefaultDiscoverURLTest default URL for discovery in test env
-	DefaultDiscoverURLTest = "http://dmsgd.skywire.dev"
+	DefaultDiscoverURLTest = skyenv.TestDmsgDiscAddr
 )
 
 // Config is structure of config file