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

Replace "github.com/skycoin/skywire-utilities" imports with "github.com/skycoin/skywire/pkg/skywire-utilities" #1912

Merged
merged 2 commits into from
Dec 17, 2024
Merged

Replace "github.com/skycoin/skywire-utilities" imports with "github.com/skycoin/skywire/pkg/skywire-utilities" #1912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cba2e2
update skywire-utilities import
0pcom Dec 17, 2024
40d2f3e
update skywire-utilities import
0pcom Dec 17, 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
6 changes: 3 additions & 3 deletions cmd/apps/skychat/commands/skychat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import (
ipc "github.com/james-barrow/golang-ipc"
"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire-utilities/pkg/netutil"
"github.com/skycoin/skywire/pkg/app"
"github.com/skycoin/skywire/pkg/app/appnet"
"github.com/skycoin/skywire/pkg/app/appserver"
"github.com/skycoin/skywire/pkg/routing"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil"
"github.com/skycoin/skywire/pkg/visor/visorconfig"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/apps/skysocks-client/commands/skysocks-client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ import (
ipc "github.com/james-barrow/golang-ipc"
"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire-utilities/pkg/netutil"
"github.com/skycoin/skywire/internal/skysocks"
"github.com/skycoin/skywire/pkg/app"
"github.com/skycoin/skywire/pkg/app/appnet"
"github.com/skycoin/skywire/pkg/app/appserver"
"github.com/skycoin/skywire/pkg/routing"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil"
"github.com/skycoin/skywire/pkg/visor/visorconfig"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/apps/skysocks/commands/skysocks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
ipc "github.com/james-barrow/golang-ipc"
"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire/internal/skysocks"
"github.com/skycoin/skywire/pkg/app"
"github.com/skycoin/skywire/pkg/app/appnet"
"github.com/skycoin/skywire/pkg/app/appserver"
"github.com/skycoin/skywire/pkg/routing"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire/pkg/visor/visorconfig"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/apps/vpn-client/commands/vpn-client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import (
ipc "github.com/james-barrow/golang-ipc"
"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/internal/vpn"
"github.com/skycoin/skywire/pkg/app"
"github.com/skycoin/skywire/pkg/app/appevent"
"github.com/skycoin/skywire/pkg/app/appserver"
"github.com/skycoin/skywire/pkg/routing"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/visor/visorconfig"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/apps/vpn-server/commands/vpn-server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import (

"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/internal/vpn"
"github.com/skycoin/skywire/pkg/app"
"github.com/skycoin/skywire/pkg/app/appnet"
"github.com/skycoin/skywire/pkg/app/appserver"
"github.com/skycoin/skywire/pkg/routing"
"github.com/skycoin/skywire/pkg/skyenv"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions cmd/setup-node/commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire-utilities/pkg/cmdutil"
"github.com/skycoin/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire-utilities/pkg/metricsutil"
"github.com/skycoin/skywire/pkg/router"
"github.com/skycoin/skywire/pkg/router/setupmetrics"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/skycoin-skywire/commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ import (
"github.com/spf13/cobra"

services "github.com/skycoin/skywire-services/cmd/skywire-services/commands"
"github.com/skycoin/skywire-utilities/pkg/buildinfo"
sc "github.com/skycoin/skywire/cmd/apps/skychat/commands"
ssc "github.com/skycoin/skywire/cmd/apps/skysocks-client/commands"
ss "github.com/skycoin/skywire/cmd/apps/skysocks/commands"
vpnc "github.com/skycoin/skywire/cmd/apps/vpn-client/commands"
vpns "github.com/skycoin/skywire/cmd/apps/vpn-server/commands"
sn "github.com/skycoin/skywire/cmd/setup-node/commands"
scli "github.com/skycoin/skywire/cmd/skywire-cli/commands"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire/pkg/visor"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/skywire-cli/commands/config/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import (
coinCipher "github.com/skycoin/skycoin/src/cipher"
"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire-utilities/pkg/netutil"
"github.com/skycoin/skywire/pkg/app/appserver"
"github.com/skycoin/skywire/pkg/dmsgc"
"github.com/skycoin/skywire/pkg/routing"
"github.com/skycoin/skywire/pkg/skyenv"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil"
"github.com/skycoin/skywire/pkg/transport/network"
"github.com/skycoin/skywire/pkg/visor/visorconfig"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/skywire-cli/commands/config/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/skycoin/dmsg/pkg/disc"
"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/pkg/visor/visorconfig"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/skywire-cli/commands/config/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/cmdutil"
"github.com/skycoin/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/pkg/visor/visorconfig"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/skywire-cli/commands/config/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"github.com/spf13/cobra"

"github.com/skycoin/skywire"
"github.com/skycoin/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/pkg/dmsgc"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/pkg/visor/visorconfig"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/skywire-cli/commands/dmsgpty/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"github.com/skycoin/skywire-utilities/pkg/cmdutil"
"github.com/skycoin/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/cmd/skywire-cli/internal"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/pkg/visor"
)

Expand Down Expand Up @@ -75,7 +75,7 @@
port, _ := strconv.ParseUint(ptyPort, 10, 16) //nolint
ctx, cancel := cmdutil.SignalContext(context.Background(), nil)
defer cancel()
return cli.StartRemotePty(ctx, addr, uint16(port), dmsgpty.DefaultCmd)

Check failure on line 78 in cmd/skywire-cli/commands/dmsgpty/root.go

View workflow job for this annotation

GitHub Actions / darwin 

cannot use addr (variable of type `"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".PubKey`) as `"github.com/skycoin/skywire-utilities/pkg/cipher".PubKey` value in argument to `cli.StartRemotePty` (typecheck)

Check failure on line 78 in cmd/skywire-cli/commands/dmsgpty/root.go

View workflow job for this annotation

GitHub Actions / linux 

cannot use addr (variable of type `"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".PubKey`) as `"github.com/skycoin/skywire-utilities/pkg/cipher".PubKey` value in argument to `cli.StartRemotePty` (typecheck)
},
}

Expand Down
6 changes: 3 additions & 3 deletions cmd/skywire-cli/commands/log/log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"github.com/spf13/cobra"

"github.com/skycoin/skywire"
"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/pkg/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
)

func init() {
Expand Down Expand Up @@ -121,7 +121,7 @@
pk, sk = cipher.GenerateKeyPair()
}

dmsgC, closeDmsg, err := dg.StartDmsg(ctx, log, pk, sk)

Check failure on line 124 in cmd/skywire-cli/commands/log/log.go

View workflow job for this annotation

GitHub Actions / darwin 

cannot use log (variable of type *"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging".Logger) as *"github.com/skycoin/skywire-utilities/pkg/logging".Logger value in argument to dg.StartDmsg

Check failure on line 124 in cmd/skywire-cli/commands/log/log.go

View workflow job for this annotation

GitHub Actions / darwin 

cannot use pk (variable of type "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".PubKey) as "github.com/skycoin/skywire-utilities/pkg/cipher".PubKey value in argument to dg.StartDmsg

Check failure on line 124 in cmd/skywire-cli/commands/log/log.go

View workflow job for this annotation

GitHub Actions / darwin 

cannot use sk (variable of type "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".SecKey) as "github.com/skycoin/skywire-utilities/pkg/cipher".SecKey value in argument to dg.StartDmsg

Check failure on line 124 in cmd/skywire-cli/commands/log/log.go

View workflow job for this annotation

GitHub Actions / linux 

cannot use log (variable of type *"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging".Logger) as *"github.com/skycoin/skywire-utilities/pkg/logging".Logger value in argument to dg.StartDmsg

Check failure on line 124 in cmd/skywire-cli/commands/log/log.go

View workflow job for this annotation

GitHub Actions / linux 

cannot use pk (variable of type "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".PubKey) as "github.com/skycoin/skywire-utilities/pkg/cipher".PubKey value in argument to dg.StartDmsg

Check failure on line 124 in cmd/skywire-cli/commands/log/log.go

View workflow job for this annotation

GitHub Actions / linux 

cannot use sk (variable of type "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".SecKey) as "github.com/skycoin/skywire-utilities/pkg/cipher".SecKey value in argument to dg.StartDmsg
if err != nil {
log.Error(err)
return
Expand All @@ -131,7 +131,7 @@
// Connect dmsgC to all servers
allServer := getAllDMSGServers()
for _, server := range allServer {
dmsgC.EnsureAndObtainSession(ctx, server.PK) //nolint

Check failure on line 134 in cmd/skywire-cli/commands/log/log.go

View workflow job for this annotation

GitHub Actions / darwin 

cannot use server.PK (variable of type "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".PubKey) as "github.com/skycoin/skywire-utilities/pkg/cipher".PubKey value in argument to dmsgC.EnsureAndObtainSession (typecheck)

Check failure on line 134 in cmd/skywire-cli/commands/log/log.go

View workflow job for this annotation

GitHub Actions / linux 

cannot use server.PK (variable of type "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".PubKey) as "github.com/skycoin/skywire-utilities/pkg/cipher".PubKey value in argument to dmsgC.EnsureAndObtainSession (typecheck)
}

minimumVersion, _ := version.NewVersion(minv) //nolint
Expand Down
2 changes: 1 addition & 1 deletion cmd/skywire-cli/commands/log/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
package clilog

import (
"github.com/skycoin/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/skywire-cli/commands/log/st.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/pterm/pterm"
"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/skywire-cli/commands/mdisc/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"github.com/spf13/pflag"

"github.com/skycoin/skywire"
"github.com/skycoin/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/cmd/skywire-cli/internal"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
)

var (
Expand Down Expand Up @@ -85,7 +85,7 @@
pk := internal.ParsePK(cmd.Flags(), "visor-public-key", args[0])

masterLogger.SetLevel(logrus.InfoLevel)
entry, err := disc.NewHTTP(mdURL, &http.Client{}, packageLogger).Entry(ctx, pk)

Check failure on line 88 in cmd/skywire-cli/commands/mdisc/root.go

View workflow job for this annotation

GitHub Actions / darwin 

cannot use packageLogger (variable of type *"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging".Logger) as *"github.com/skycoin/skywire-utilities/pkg/logging".Logger value in argument to disc.NewHTTP

Check failure on line 88 in cmd/skywire-cli/commands/mdisc/root.go

View workflow job for this annotation

GitHub Actions / darwin 

cannot use pk (variable of type "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".PubKey) as "github.com/skycoin/skywire-utilities/pkg/cipher".PubKey value in argument to disc.NewHTTP(mdURL, &http.Client{}, packageLogger).Entry

Check failure on line 88 in cmd/skywire-cli/commands/mdisc/root.go

View workflow job for this annotation

GitHub Actions / linux 

cannot use packageLogger (variable of type *"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging".Logger) as *"github.com/skycoin/skywire-utilities/pkg/logging".Logger value in argument to disc.NewHTTP

Check failure on line 88 in cmd/skywire-cli/commands/mdisc/root.go

View workflow job for this annotation

GitHub Actions / linux 

cannot use pk (variable of type "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".PubKey) as "github.com/skycoin/skywire-utilities/pkg/cipher".PubKey value in argument to disc.NewHTTP(mdURL, &http.Client{}, packageLogger).Entry

Check failure on line 88 in cmd/skywire-cli/commands/mdisc/root.go

View workflow job for this annotation

GitHub Actions / windows 

cannot use packageLogger (variable of type *"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging".Logger) as *"github.com/skycoin/skywire-utilities/pkg/logging".Logger value in argument to disc.NewHTTP

Check failure on line 88 in cmd/skywire-cli/commands/mdisc/root.go

View workflow job for this annotation

GitHub Actions / windows 

cannot use pk (variable of type "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".PubKey) as "github.com/skycoin/skywire-utilities/pkg/cipher".PubKey value in argument to disc.NewHTTP(mdURL, &http.Client{}, packageLogger).Entry
internal.Catch(cmd.Flags(), err)
internal.PrintOutput(cmd.Flags(), entry, fmt.Sprintln(entry))
},
Expand All @@ -100,7 +100,7 @@

masterLogger.SetLevel(logrus.InfoLevel)

entries, err := disc.NewHTTP(mdURL, &http.Client{}, packageLogger).AvailableServers(ctx)

Check failure on line 103 in cmd/skywire-cli/commands/mdisc/root.go

View workflow job for this annotation

GitHub Actions / darwin 

cannot use packageLogger (variable of type *"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging".Logger) as *"github.com/skycoin/skywire-utilities/pkg/logging".Logger value in argument to disc.NewHTTP

Check failure on line 103 in cmd/skywire-cli/commands/mdisc/root.go

View workflow job for this annotation

GitHub Actions / linux 

cannot use packageLogger (variable of type *"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging".Logger) as *"github.com/skycoin/skywire-utilities/pkg/logging".Logger value in argument to disc.NewHTTP

Check failure on line 103 in cmd/skywire-cli/commands/mdisc/root.go

View workflow job for this annotation

GitHub Actions / windows 

cannot use packageLogger (variable of type *"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging".Logger) as *"github.com/skycoin/skywire-utilities/pkg/logging".Logger value in argument to disc.NewHTTP
internal.Catch(cmd.Flags(), err)
printAvailableServers(cmd.Flags(), entries)
},
Expand Down Expand Up @@ -128,7 +128,7 @@
sEntry := serverEntry{
Version: entry.Version,
Registered: entry.Timestamp,
PublicKey: entry.Static,

Check failure on line 131 in cmd/skywire-cli/commands/mdisc/root.go

View workflow job for this annotation

GitHub Actions / darwin 

cannot use entry.Static (variable of type "github.com/skycoin/skywire-utilities/pkg/cipher".PubKey) as "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".PubKey value in struct literal (typecheck)

Check failure on line 131 in cmd/skywire-cli/commands/mdisc/root.go

View workflow job for this annotation

GitHub Actions / linux 

cannot use entry.Static (variable of type "github.com/skycoin/skywire-utilities/pkg/cipher".PubKey) as "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".PubKey value in struct literal (typecheck)

Check failure on line 131 in cmd/skywire-cli/commands/mdisc/root.go

View workflow job for this annotation

GitHub Actions / windows 

cannot use entry.Static (variable of type "github.com/skycoin/skywire-utilities/pkg/cipher".PubKey) as "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".PubKey value in struct literal
Address: entry.Server.Address,
AvailableSessions: entry.Server.AvailableSessions,
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/skywire-cli/commands/proxy/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import (
"github.com/tidwall/pretty"

"github.com/skycoin/skywire"
"github.com/skycoin/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire-utilities/pkg/cmdutil"
clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc"
"github.com/skycoin/skywire/cmd/skywire-cli/internal"
"github.com/skycoin/skywire/pkg/app/appserver"
"github.com/skycoin/skywire/pkg/routing"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil"
"github.com/skycoin/skywire/pkg/visor/visorconfig"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/skywire-cli/commands/proxy/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package skysocksc
import (
"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/servicedisc"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/skywire-cli/commands/rewards/calc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"github.com/tidwall/pretty"

"github.com/skycoin/skywire"
"github.com/skycoin/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire-utilities/pkg/logging"
tgbot "github.com/skycoin/skywire/cmd/skywire-cli/commands/rewards/tgbot"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
)

const yearlyTotalRewardsPerPool int = 408000
Expand Down
6 changes: 3 additions & 3 deletions cmd/skywire-cli/commands/rewards/ui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"github.com/spf13/cobra"

"github.com/skycoin/skywire"
"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/pkg/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
)

func init() {
Expand Down Expand Up @@ -164,7 +164,7 @@
}
dconf := dmsg.DefaultConfig()
dconf.MinSessions = dmsgSess
dmsgclient := dmsg.NewClient(pk, sk, disc.NewHTTP(dmsgDisc, &http.Client{}, log), dconf)

Check failure on line 167 in cmd/skywire-cli/commands/rewards/ui.go

View workflow job for this annotation

GitHub Actions / darwin 

cannot use pk (variable of type "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".PubKey) as "github.com/skycoin/skywire-utilities/pkg/cipher".PubKey value in argument to dmsg.NewClient

Check failure on line 167 in cmd/skywire-cli/commands/rewards/ui.go

View workflow job for this annotation

GitHub Actions / linux 

cannot use pk (variable of type "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher".PubKey) as "github.com/skycoin/skywire-utilities/pkg/cipher".PubKey value in argument to dmsg.NewClient
defer func() {
if err := dmsgclient.Close(); err != nil {
log.WithError(err).Error()
Expand Down
2 changes: 1 addition & 1 deletion cmd/skywire-cli/commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/pterm/pterm/putils"
"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/buildinfo"
clicompletion "github.com/skycoin/skywire/cmd/skywire-cli/commands/completion"
cliconfig "github.com/skycoin/skywire/cmd/skywire-cli/commands/config"
clidmsgpty "github.com/skycoin/skywire/cmd/skywire-cli/commands/dmsgpty"
Expand All @@ -31,6 +30,7 @@ import (
clivisor "github.com/skycoin/skywire/cmd/skywire-cli/commands/visor"
clivpn "github.com/skycoin/skywire/cmd/skywire-cli/commands/vpn"
"github.com/skycoin/skywire/cmd/skywire-cli/internal"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/skywire-cli/commands/route/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import (
"golang.org/x/net/context"

"github.com/skycoin/skywire"
"github.com/skycoin/skywire-utilities/pkg/cipher"
clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc"
"github.com/skycoin/skywire/cmd/skywire-cli/internal"
"github.com/skycoin/skywire/pkg/routefinder/rfclient"
"github.com/skycoin/skywire/pkg/router"
"github.com/skycoin/skywire/pkg/routing"
"github.com/skycoin/skywire/pkg/skyenv"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/visor/visorconfig"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/skywire-cli/commands/rpc/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/spf13/pflag"

"github.com/skycoin/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/cmd/skywire-cli/internal"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/pkg/visor"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/skywire-cli/commands/skyrev/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/google/uuid"
"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/cipher"
clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc"
"github.com/skycoin/skywire/cmd/skywire-cli/internal"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions cmd/skywire-cli/commands/survey/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"github.com/spf13/cobra"

"github.com/skycoin/skywire"
"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/cmd/skywire-cli/internal"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/pkg/visor/visorconfig"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/skywire-cli/commands/tp/tp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"github.com/tidwall/pretty"

"github.com/skycoin/skywire"
"github.com/skycoin/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire-utilities/pkg/logging"
clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc"
"github.com/skycoin/skywire/cmd/skywire-cli/internal"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/pkg/transport"
"github.com/skycoin/skywire/pkg/transport/network"
"github.com/skycoin/skywire/pkg/visor"
Expand Down
2 changes: 1 addition & 1 deletion cmd/skywire-cli/commands/visor/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (

"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/cipher"
clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc"
"github.com/skycoin/skywire/cmd/skywire-cli/internal"
"github.com/skycoin/skywire/pkg/app/appcommon"
"github.com/skycoin/skywire/pkg/app/appserver"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
)

var appName string
Expand Down
2 changes: 1 addition & 1 deletion cmd/skywire-cli/commands/visor/hv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/spf13/pflag"
"github.com/toqueteos/webbrowser"

"github.com/skycoin/skywire-utilities/pkg/cipher"
clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc"
"github.com/skycoin/skywire/cmd/skywire-cli/internal"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire/pkg/visor/visorconfig"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/skywire-cli/commands/visor/ip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/cmd/skywire-cli/internal"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire/pkg/transport/network"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/skywire-cli/commands/visor/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package clivisor
import (
"github.com/spf13/cobra"

"github.com/skycoin/skywire-utilities/pkg/logging"
clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc"
"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
)

var logger = logging.MustGetLogger("skywire-cli")
Expand Down
Loading
Loading