diff --git a/cmd/skywire-cli/commands/log/root.go b/cmd/skywire-cli/commands/log/root.go index 5340174cff..dded020a5c 100644 --- a/cmd/skywire-cli/commands/log/root.go +++ b/cmd/skywire-cli/commands/log/root.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/go-version" "github.com/sirupsen/logrus" - "github.com/skycoin/dmsg/pkg/dmsgget" + "github.com/skycoin/dmsg/pkg/dmsgcurl" "github.com/skycoin/dmsg/pkg/dmsghttp" "github.com/spf13/cobra" @@ -61,8 +61,8 @@ func init() { logCmd.Flags().Int64Var(&maxFileSize, "maxfilesize", 30, "maximum file size allowed to download during collecting logs, in KB") logCmd.Flags().StringVarP(&dmsgDisc, "dmsg-disc", "D", skyenv.DmsgDiscAddr, "dmsg discovery url\n") logCmd.Flags().StringVarP(&utAddr, "ut", "u", "", "custom uptime tracker url") - if os.Getenv("DMSGGET_SK") != "" { - sk.Set(os.Getenv("DMSGGET_SK")) //nolint + if os.Getenv("DMSGCURL_SK") != "" { + sk.Set(os.Getenv("DMSGCURL_SK")) //nolint } logCmd.Flags().VarP(&sk, "sk", "s", "a random key is generated if unspecified\n\r") } @@ -101,8 +101,8 @@ var logCmd = &cobra.Command{ return } - // Create dmsgget instance - dg := dmsgget.New(flag.CommandLine) + // Create dmsgcurl instance + dg := dmsgcurl.New(flag.CommandLine) flag.Parse() // Set the uptime tracker to fetch data from diff --git a/internal/vpn/env.go b/internal/vpn/env.go index 6b93893225..c424d7b3e0 100644 --- a/internal/vpn/env.go +++ b/internal/vpn/env.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/skycoin/dmsg/pkg/dmsgget" + "github.com/skycoin/dmsg/pkg/dmsgcurl" "github.com/skycoin/skywire-utilities/pkg/cipher" ) @@ -137,7 +137,7 @@ func ParseIP(addr string) (net.IP, bool, error) { if addr == "" { return nil, false, nil } - var url dmsgget.URL + var url dmsgcurl.URL // in case dmsghttp url is provided err := url.Fill(addr) diff --git a/pkg/visor/gui.go b/pkg/visor/gui.go index bc857100ed..3d3b60ca66 100644 --- a/pkg/visor/gui.go +++ b/pkg/visor/gui.go @@ -20,7 +20,7 @@ import ( "github.com/skycoin/dmsg/pkg/direct" dmsgdisc "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/dmsg/pkg/dmsgget" + "github.com/skycoin/dmsg/pkg/dmsgcurl" "github.com/skycoin/dmsg/pkg/dmsghttp" "github.com/skycoin/systray" "github.com/toqueteos/webbrowser" @@ -314,7 +314,7 @@ func getAvailPublicVPNServers(conf *visorconfig.V1, httpC *http.Client, logger * } func getSystrayHTTPClient(ctx context.Context, conf *visorconfig.V1, logger *logging.MasterLogger) *http.Client { - var serviceURL dmsgget.URL + var serviceURL dmsgcurl.URL serviceURL.Fill(conf.Launcher.ServiceDisc) //nolint if serviceURL.Scheme == "dmsg" { var keys cipher.PubKeys diff --git a/pkg/visor/init.go b/pkg/visor/init.go index 3e060322c7..8c1f82bbc9 100644 --- a/pkg/visor/init.go +++ b/pkg/visor/init.go @@ -24,7 +24,7 @@ import ( dmsgdisc "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/dmsg/pkg/dmsgctrl" - "github.com/skycoin/dmsg/pkg/dmsgget" + "github.com/skycoin/dmsg/pkg/dmsgcurl" "github.com/skycoin/dmsg/pkg/dmsghttp" "github.com/skycoin/dmsg/pkg/dmsgpty" @@ -469,7 +469,7 @@ func initDmsgTrackers(ctx context.Context, v *Visor, _ *logging.Logger) error { func initSudphClient(ctx context.Context, v *Visor, log *logging.Logger) error { - var serviceURL dmsgget.URL + var serviceURL dmsgcurl.URL _ = serviceURL.Fill(v.conf.Transport.AddressResolver) //nolint:errcheck // don't start sudph if we are connection to AR via dmsghttp if serviceURL.Scheme == "dmsg" { @@ -1588,7 +1588,7 @@ func getErrors(ctx context.Context) chan error { func getHTTPClient(ctx context.Context, v *Visor, service string) (*http.Client, error) { - var serviceURL dmsgget.URL + var serviceURL dmsgcurl.URL var delegatedServers []cipher.PubKey err := serviceURL.Fill(service) @@ -1628,7 +1628,7 @@ func getHTTPClient(ctx context.Context, v *Visor, service string) (*http.Client, } func getPublicIP(v *Visor, service string) (string, error) { - var serviceURL dmsgget.URL + var serviceURL dmsgcurl.URL var pIP string err := serviceURL.Fill(service) // only get the IP if the url is of dmsg