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

update dependencies #1614

Merged
merged 2 commits into from
Jun 19, 2023
Merged

update dependencies #1614

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
3bf78cb
update dmsg@develop | use hashicorp yamux instead our outdated fork
mrpalide Jun 9, 2023
c639352
Merge remote-tracking branch 'origin/develop' into fix/update-dmsg-us…
jdknives Jun 19, 2023
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 go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ require (
github.com/gen2brain/dlgs v0.0.0-20210911090025-cbd38e821b98
github.com/google/uuid v1.1.2
github.com/gorilla/securecookie v1.1.1
github.com/hashicorp/yamux v0.1.1
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/reedsolomon v1.9.9 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2
Expand All @@ -19,7 +20,6 @@ require (
github.com/shirou/gopsutil/v3 v3.21.4
github.com/sirupsen/logrus v1.8.1
github.com/skycoin/skycoin v0.27.1
github.com/skycoin/yamux v0.0.0-20200803175205-571ceb89da9f
github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
github.com/spf13/cobra v1.4.0
github.com/stretchr/testify v1.8.3
Expand All @@ -45,13 +45,13 @@ require (
github.com/go-chi/chi/v5 v5.0.8-0.20220103230436-7dbe9a0bd10f
github.com/gocarina/gocsv v0.0.0-20220927221512-ad3251f9fa25
github.com/hashicorp/go-version v1.6.0
github.com/ivanpirog/coloredcobra v1.0.0
github.com/ivanpirog/coloredcobra v1.0.1
github.com/james-barrow/golang-ipc v0.0.0-20210227130457-95e7cc81f5e2
github.com/jaypipes/ghw v0.10.0
github.com/lib/pq v1.10.7
github.com/orandin/lumberjackrus v1.0.1
github.com/pterm/pterm v0.12.49
github.com/skycoin/dmsg v1.3.0-rc1.0.20230224131835-1c194ef9791e
github.com/skycoin/dmsg v1.3.0-rc1.0.20230609193507-b02bb8f7d1bc
github.com/skycoin/skywire-utilities v0.0.0-20230601232053-0abbc9604fbc
github.com/skycoin/systray v1.10.0
github.com/spf13/pflag v1.0.5
Expand Down
629 changes: 10 additions & 619 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/skysocks/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"sync"
"time"

"github.com/hashicorp/yamux"
ipc "github.com/james-barrow/golang-ipc"
"github.com/skycoin/yamux"

"github.com/skycoin/skywire/pkg/app"
"github.com/skycoin/skywire/pkg/router"
Expand Down
2 changes: 1 addition & 1 deletion internal/skysocks/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"sync/atomic"

"github.com/armon/go-socks5"
"github.com/hashicorp/yamux"
ipc "github.com/james-barrow/golang-ipc"
"github.com/skycoin/yamux"

"github.com/skycoin/skywire/pkg/app"
"github.com/skycoin/skywire/pkg/app/appserver"
Expand Down
3 changes: 0 additions & 3 deletions vendor/github.com/skycoin/yamux/.gitignore → vendor/github.com/hashicorp/yamux/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 vendor/github.com/skycoin/yamux/LICENSE → vendor/github.com/hashicorp/yamux/LICENSE
View file
Open in desktop
File renamed without changes.
0 vendor/github.com/skycoin/yamux/README.md → vendor/github.com/hashicorp/yamux/README.md
View file
Open in desktop
File renamed without changes.
0 vendor/github.com/skycoin/yamux/addr.go → vendor/github.com/hashicorp/yamux/addr.go
View file
Open in desktop
File renamed without changes.
29 changes: 23 additions & 6 deletions vendor/github.com/skycoin/yamux/const.go → vendor/github.com/hashicorp/yamux/const.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions vendor/github.com/skycoin/yamux/mux.go → vendor/github.com/hashicorp/yamux/mux.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading