Skip to content

Commit 9f63550

Browse files
committed
Revert "rm go.mod ; go mod init ; go mod tidy && go mod vendor"
This reverts commit ac75b70.
1 parent ac75b70 commit 9f63550

File tree

516 files changed

+11344
-37362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

516 files changed

+11344
-37362
lines changed

cmd/dmsg-server/commands/config/gen.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
package config
33

44
import (
5+
"github.com/skycoin/dmsg/pkg/dmsgserver"
6+
57
"github.com/sirupsen/logrus"
68
"github.com/skycoin/skycoin/src/util/logging"
79
"github.com/spf13/cobra"
8-
9-
"github.com/skycoin/dmsg/pkg/dmsgserver"
1010
)
1111

1212
var (

cmd/dmsg-server/commands/start/root.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@ import (
1313

1414
"github.com/go-chi/chi/v5"
1515
"github.com/go-chi/chi/v5/middleware"
16-
"github.com/skycoin/skywire-utilities/pkg/buildinfo"
17-
"github.com/skycoin/skywire-utilities/pkg/cmdutil"
18-
"github.com/skycoin/skywire-utilities/pkg/metricsutil"
1916
"github.com/spf13/cobra"
2017

2118
"github.com/skycoin/dmsg/internal/dmsg-server/api"
2219
"github.com/skycoin/dmsg/internal/servermetrics"
2320
"github.com/skycoin/dmsg/pkg/disc"
2421
dmsg "github.com/skycoin/dmsg/pkg/dmsg"
2522
"github.com/skycoin/dmsg/pkg/dmsgserver"
23+
24+
"github.com/skycoin/skywire-utilities/pkg/buildinfo"
25+
"github.com/skycoin/skywire-utilities/pkg/cmdutil"
26+
"github.com/skycoin/skywire-utilities/pkg/metricsutil"
2627
)
2728

2829
var (

go.mod

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,30 @@
11
module github.com/skycoin/dmsg
22

3-
go 1.19
3+
go 1.16
44

55
require (
66
github.com/ActiveState/termtest/conpty v0.5.0
7-
github.com/VictoriaMetrics/metrics v1.23.0
8-
github.com/creack/pty v1.1.18
9-
github.com/go-chi/chi/v5 v5.0.8
7+
github.com/VictoriaMetrics/metrics v1.18.1
8+
github.com/creack/pty v1.1.15
9+
github.com/go-chi/chi/v5 v5.0.8-0.20220103230436-7dbe9a0bd10f
1010
github.com/go-redis/redis/v8 v8.11.5
11+
github.com/google/go-cmp v0.5.7 // indirect
1112
github.com/json-iterator/go v1.1.12
13+
github.com/klauspost/compress v1.11.0 // indirect
1214
github.com/pires/go-proxyproto v0.6.2
13-
github.com/sirupsen/logrus v1.9.0
15+
github.com/sirupsen/logrus v1.8.1
1416
github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6
1517
github.com/skycoin/skycoin v0.27.1
16-
github.com/skycoin/skywire-utilities v0.0.0-20220712145352-a6ac657e6012
18+
github.com/skycoin/skywire-utilities v0.0.0-20220712142443-abafa30105ce
1719
github.com/skycoin/yamux v0.0.0-20200803175205-571ceb89da9f
18-
github.com/spf13/cobra v1.6.1
19-
github.com/stretchr/testify v1.8.1
20-
golang.org/x/net v0.4.0
21-
golang.org/x/sys v0.3.0
22-
golang.org/x/term v0.3.0
23-
nhooyr.io/websocket v1.8.7
20+
github.com/spf13/cobra v1.4.0
21+
github.com/stretchr/testify v1.7.0
22+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
23+
golang.org/x/net v0.0.0-20211020060615-d418f374d309
24+
golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b
25+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
26+
nhooyr.io/websocket v1.8.2
2427
)
2528

26-
require (
27-
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
28-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
29-
github.com/davecgh/go-spew v1.1.1 // indirect
30-
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
31-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
32-
github.com/klauspost/compress v1.10.3 // indirect
33-
github.com/mattn/go-colorable v0.1.12 // indirect
34-
github.com/mattn/go-isatty v0.0.14 // indirect
35-
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
36-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
37-
github.com/modern-go/reflect2 v1.0.2 // indirect
38-
github.com/pmezard/go-difflib v1.0.0 // indirect
39-
github.com/spf13/pflag v1.0.5 // indirect
40-
github.com/valyala/fastrand v1.1.0 // indirect
41-
github.com/valyala/histogram v1.2.0 // indirect
42-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect
43-
gopkg.in/yaml.v3 v3.0.1 // indirect
44-
)
29+
// Uncomment for tests with alternate branches of 'skywire-utilities'
30+
// replace github.com/skycoin/skywire-utilities => ../skywire-utilities

go.sum

Lines changed: 791 additions & 57 deletions
Large diffs are not rendered by default.

vendor/github.com/ActiveState/termtest/conpty/go.mod

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ActiveState/termtest/conpty/go.sum

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ActiveState/termtest/conpty/term_other.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ActiveState/termtest/conpty/term_windows.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/go-ansiterm/winterm/ansi.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/go-ansiterm/winterm/api.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)