Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix wrong hardcoded default dmsg discovery #271

Merged
merged 3 commits into from
Jul 2, 2024
Merged

Fix wrong hardcoded default dmsg discovery #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bb1662
change hardcoded dmsg discovery to use skywire-utilities/skyenv.DmsgD…
0pcom Jul 2, 2024
7334330
ensure correct commit hash of deps
0pcom Jul 2, 2024
ac7c817
make format
0pcom Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion examples/dmsgcurl/dmsg-example-http-server/dmsg-example-http-server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion pkg/dmsg/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion pkg/dmsgcurl/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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")
}

Expand Down
5 changes: 3 additions & 2 deletions pkg/dmsgserver/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading