Merge pull request #9 from nkryuchkov/fix/remove-skywire-dependency

Remove Skywire dependency
skycoin · Aug 31, 2020 · 62ac73c · 62ac73c
2 parents 85148a7 + 4cf1d7c
commit 62ac73c
Show file tree

Hide file tree

Showing 300 changed files with 42,098 additions and 14,038 deletions.
diff --git a/Makefile b/Makefile
@@ -19,8 +19,8 @@ ifneq (,$(findstring 64,$(GOARCH)))
     TEST_OPTS:=$(TEST_OPTS) $(RACE_FLAG)
 endif
 
-SKYWIRE_MAINNET := github.com/skycoin/skywire
-BUILDINFO_PATH := $(SKYWIRE_MAINNET)/pkg/util/buildinfo
+DMSG_REPO := github.com/skycoin/dmsg
+BUILDINFO_PATH := $(DMSG_REPO)/buildinfo
 
 BUILDINFO_VERSION := -X $(BUILDINFO_PATH).version=$(VERSION)
 BUILDINFO_DATE := -X $(BUILDINFO_PATH).date=$(DATE)

diff --git a/...n/skywire/pkg/util/buildinfo/buildinfo.go → buildinfo/buildinfo.go b/...n/skywire/pkg/util/buildinfo/buildinfo.go → buildinfo/buildinfo.go
diff --git a/cmd/dmsg-discovery/commands/root.go b/cmd/dmsg-discovery/commands/root.go
@@ -10,9 +10,9 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	logrussyslog "github.com/sirupsen/logrus/hooks/syslog"
 	"github.com/skycoin/skycoin/src/util/logging"
-	"github.com/skycoin/skywire/pkg/util/buildinfo"
 	"github.com/spf13/cobra"
 
+	"github.com/skycoin/dmsg/buildinfo"
 	"github.com/skycoin/dmsg/cmd/dmsg-discovery/internal/api"
 	"github.com/skycoin/dmsg/cmd/dmsg-discovery/internal/store"
 	"github.com/skycoin/dmsg/discord"

diff --git a/cmd/dmsg-server/commands/root.go b/cmd/dmsg-server/commands/root.go
@@ -14,10 +14,10 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	logrussyslog "github.com/sirupsen/logrus/hooks/syslog"
 	"github.com/skycoin/skycoin/src/util/logging"
-	"github.com/skycoin/skywire/pkg/util/buildinfo"
 	"github.com/spf13/cobra"
 
 	"github.com/skycoin/dmsg"
+	"github.com/skycoin/dmsg/buildinfo"
 	"github.com/skycoin/dmsg/cipher"
 	"github.com/skycoin/dmsg/disc"
 	"github.com/skycoin/dmsg/discord"

diff --git a/cmd/dmsgpty-cli/commands/root.go b/cmd/dmsgpty-cli/commands/root.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"log"
 
-	"github.com/skycoin/skywire/pkg/util/buildinfo"
 	"github.com/spf13/cobra"
 
 	"github.com/skycoin/dmsg"
+	"github.com/skycoin/dmsg/buildinfo"
 	"github.com/skycoin/dmsg/cmdutil"
 	"github.com/skycoin/dmsg/dmsgpty"
 )

diff --git a/cmd/dmsgpty-host/commands/root.go b/cmd/dmsgpty-host/commands/root.go
@@ -12,13 +12,13 @@ import (
 
 	"github.com/sirupsen/logrus"
 	"github.com/skycoin/skycoin/src/util/logging"
-	"github.com/skycoin/skywire/pkg/util/buildinfo"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 
 	"github.com/skycoin/dmsg"
+	"github.com/skycoin/dmsg/buildinfo"
 	"github.com/skycoin/dmsg/cipher"
 	"github.com/skycoin/dmsg/cmdutil"
 	"github.com/skycoin/dmsg/disc"

diff --git a/cmd/dmsgpty-ui/commands/root.go b/cmd/dmsgpty-ui/commands/root.go
@@ -6,9 +6,9 @@ import (
 	"os"
 
 	"github.com/sirupsen/logrus"
-	"github.com/skycoin/skywire/pkg/util/buildinfo"
 	"github.com/spf13/cobra"
 
+	"github.com/skycoin/dmsg/buildinfo"
 	"github.com/skycoin/dmsg/cmdutil"
 	"github.com/skycoin/dmsg/dmsgpty"
 )

diff --git a/discord/discord.go b/discord/discord.go
@@ -12,18 +12,20 @@ const (
 	webhookURLEnvName = "DISCORD_WEBHOOK_URL"
 )
 
+// NewHook creates a new Discord hook.
 func NewHook(tag, webHookURL string) logrus.Hook {
 	return discordrus.NewHook(webHookURL, logrus.ErrorLevel, discordOpts(tag))
 }
 
 func discordOpts(tag string) *discordrus.Opts {
 	return &discordrus.Opts{
-		Username:           tag,
-		TimestampFormat:    time.RFC3339,
-		TimestampLocale:    time.UTC,
+		Username:        tag,
+		TimestampFormat: time.RFC3339,
+		TimestampLocale: time.UTC,
 	}
 }
 
+// GetWebhookURLFromEnv extracts Discord webhook URL from environment variables.
 func GetWebhookURLFromEnv() string {
 	return os.Getenv(webhookURLEnvName)
 }
diff --git a/go.mod b/go.mod
@@ -8,17 +8,19 @@ require (
 	github.com/go-redis/redis v6.15.6+incompatible
 	github.com/gorilla/handlers v1.4.2
 	github.com/kz/discordrus v1.2.0
+	github.com/mattn/go-colorable v0.1.7 // indirect
+	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
+	github.com/onsi/ginkgo v1.14.0 // indirect
 	github.com/prometheus/client_golang v1.3.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/skycoin/skycoin v0.26.0
-	github.com/skycoin/skywire v0.2.3-0.20200831124957-47a942882d2b
 	github.com/skycoin/yamux v0.0.0-20200803175205-571ceb89da9f
 	github.com/spf13/cast v1.3.0
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.3
 	github.com/spf13/viper v1.6.2
 	github.com/stretchr/testify v1.4.0
 	golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073
-	golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a
+	golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7
 	nhooyr.io/websocket v1.8.2
 )
diff --git a/go.sum b/go.sum
diff --git a/vendor/github.com/fsnotify/fsnotify/.editorconfig b/vendor/github.com/fsnotify/fsnotify/.editorconfig
diff --git a/vendor/github.com/fsnotify/fsnotify/.gitattributes b/vendor/github.com/fsnotify/fsnotify/.gitattributes
diff --git a/vendor/github.com/fsnotify/fsnotify/.travis.yml b/vendor/github.com/fsnotify/fsnotify/.travis.yml
diff --git a/vendor/github.com/fsnotify/fsnotify/LICENSE b/vendor/github.com/fsnotify/fsnotify/LICENSE
diff --git a/vendor/github.com/fsnotify/fsnotify/README.md b/vendor/github.com/fsnotify/fsnotify/README.md
diff --git a/vendor/github.com/fsnotify/fsnotify/fsnotify.go b/vendor/github.com/fsnotify/fsnotify/fsnotify.go
diff --git a/vendor/github.com/fsnotify/fsnotify/go.mod b/vendor/github.com/fsnotify/fsnotify/go.mod
diff --git a/vendor/github.com/fsnotify/fsnotify/go.sum b/vendor/github.com/fsnotify/fsnotify/go.sum
diff --git a/vendor/github.com/fsnotify/fsnotify/inotify_poller.go b/vendor/github.com/fsnotify/fsnotify/inotify_poller.go
diff --git a/vendor/github.com/fsnotify/fsnotify/open_mode_bsd.go b/vendor/github.com/fsnotify/fsnotify/open_mode_bsd.go
diff --git a/vendor/github.com/fsnotify/fsnotify/open_mode_darwin.go b/vendor/github.com/fsnotify/fsnotify/open_mode_darwin.go