Update default config generation to use new services.

cmd/apps/therealssh-client/therealssh-client.go

@@ -7,8 +7,8 @@ import (
 	"flag"
 	"net/http"
 
-	"github.com/sirupsen/logrus"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/sirupsen/logrus"
 
 	"github.com/SkycoinProject/skywire-mainnet/pkg/app"
 	ssh "github.com/SkycoinProject/skywire-mainnet/pkg/therealssh"

cmd/apps/therealssh/therealssh.go

@@ -6,9 +6,9 @@ package main
 import (
 	"flag"
 
+	"github.com/SkycoinProject/skycoin/src/util/logging"
 	"github.com/mitchellh/go-homedir"
 	"github.com/sirupsen/logrus"
-	"github.com/SkycoinProject/skycoin/src/util/logging"
 
 	"github.com/SkycoinProject/skywire-mainnet/pkg/app"
 	ssh "github.com/SkycoinProject/skywire-mainnet/pkg/therealssh"

cmd/messaging-server/commands/root.go

@@ -11,12 +11,12 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-	logrussyslog "github.com/sirupsen/logrus/hooks/syslog"
 	"github.com/SkycoinProject/dmsg"
 	"github.com/SkycoinProject/dmsg/cipher"
 	"github.com/SkycoinProject/dmsg/disc"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	logrussyslog "github.com/sirupsen/logrus/hooks/syslog"
 	"github.com/spf13/cobra"
 )
 

cmd/setup-node/commands/root.go

@@ -10,9 +10,9 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/SkycoinProject/skycoin/src/util/logging"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	logrussyslog "github.com/sirupsen/logrus/hooks/syslog"
-	"github.com/SkycoinProject/skycoin/src/util/logging"
 	"github.com/spf13/cobra"
 
 	"github.com/SkycoinProject/skywire-mainnet/pkg/metrics"

cmd/skywire-cli/commands/node/gen-config.go

@@ -82,7 +82,7 @@ func defaultConfig() *visor.Config {
 	conf.Node.StaticPubKey = pk
 	conf.Node.StaticSecKey = sk
 
-	conf.Messaging.Discovery = "https://messaging.discovery.skywire.skycoin.net"
+	conf.Messaging.Discovery = "https://messaging.discovery.skywire.skycoin.com"
 	conf.Messaging.ServerCount = 1
 
 	passcode := base64.StdEncoding.EncodeToString(cipher.RandByte(8))
@@ -93,11 +93,11 @@ func defaultConfig() *visor.Config {
 	}
 	conf.TrustedNodes = []cipher.PubKey{}
 
-	conf.Transport.Discovery = "https://transport.discovery.skywire.skycoin.net"
+	conf.Transport.Discovery = "https://transport.discovery.skywire.skycoin.com"
 	conf.Transport.LogStore.Type = "file"
 	conf.Transport.LogStore.Location = "./skywire/transport_logs"
 
-	conf.Routing.RouteFinder = "https://routefinder.skywire.skycoin.net/"
+	conf.Routing.RouteFinder = "https://routefinder.skywire.skycoin.com/"
 
 	const defaultSetupNodePK = "0324579f003e6b4048bae2def4365e634d8e0e3054a20fc7af49daf2a179658557"
 	sPK := cipher.PubKey{}

cmd/skywire-cli/commands/tpdisc/root.go

@@ -8,8 +8,8 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/google/uuid"
 	"github.com/spf13/cobra"
 
 	"github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/internal"

cmd/skywire-cli/internal/internal.go

@@ -3,9 +3,9 @@ package internal
 import (
 	"fmt"
 
-	"github.com/google/uuid"
 	"github.com/SkycoinProject/dmsg/cipher"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/google/uuid"
 )
 
 var log = logging.MustGetLogger("skywire-cli")

cmd/skywire-visor/commands/root.go

@@ -18,10 +18,11 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/SkycoinProject/skycoin/src/util/logging"
 	"github.com/pkg/profile"
 	logrussyslog "github.com/sirupsen/logrus/hooks/syslog"
-	"github.com/SkycoinProject/skycoin/src/util/logging"
 	"github.com/spf13/cobra"
+
 	"github.com/SkycoinProject/skywire-mainnet/internal/utclient"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/visor"

cmd/therealssh-cli/commands/root.go

@@ -13,8 +13,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/creack/pty"
 	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/creack/pty"
 	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh/terminal"
 

internal/therealproxy/client.go

@@ -5,8 +5,8 @@ import (
 	"io"
 	"net"
 
-	"github.com/hashicorp/yamux"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/hashicorp/yamux"
 )
 
 // Log is therealproxy package level logger, it can be replaced with a different one from outside the package

internal/therealproxy/server.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net"
 
+	"github.com/SkycoinProject/skycoin/src/util/logging"
 	"github.com/armon/go-socks5"
 	"github.com/hashicorp/yamux"
-	"github.com/SkycoinProject/skycoin/src/util/logging"
 )
 
 // Server implements multiplexing proxy server using yamux.

pkg/httputil/httputil.go

@@ -7,8 +7,8 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/gorilla/handlers"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/gorilla/handlers"
 )
 
 var log = logging.MustGetLogger("httputil")

pkg/hypervisor/hypervisor.go

@@ -13,12 +13,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/go-chi/chi"
-	"github.com/go-chi/chi/middleware"
-	"github.com/google/uuid"
 	"github.com/SkycoinProject/dmsg/cipher"
 	"github.com/SkycoinProject/dmsg/noise"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/middleware"
+	"github.com/google/uuid"
+
 	"github.com/SkycoinProject/skywire-mainnet/pkg/app"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/httputil"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"

pkg/router/route_manager.go

@@ -8,13 +8,13 @@ import (
 	"net"
 	"time"
 
+	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/SkycoinProject/skycoin/src/util/logging"
 	"github.com/google/uuid"
-"github.com/SkycoinProject/dmsg/cipher"
-"github.com/SkycoinProject/skycoin/src/util/logging"
 
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/setup"
-"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 )
 
 // RMConfig represents route manager configuration.

pkg/router/route_manager_test.go

@@ -9,8 +9,8 @@ import (
 	"github.com/SkycoinProject/skywire-mainnet/pkg/setup"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/snet/snettest"
 
-	"github.com/google/uuid"
 	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 

pkg/router/router.go

@@ -14,10 +14,10 @@ import (
 	"github.com/SkycoinProject/skycoin/src/util/logging"
 
 	"github.com/SkycoinProject/skywire-mainnet/pkg/app"
-	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 	routeFinder "github.com/SkycoinProject/skywire-mainnet/pkg/route-finder/client"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/setup"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/transport"
 )
 

pkg/router/router_test.go

@@ -7,16 +7,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/sirupsen/logrus"
 	"github.com/SkycoinProject/dmsg"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	routeFinder "github.com/SkycoinProject/skywire-mainnet/pkg/route-finder/client"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/snet/snettest"
-	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/transport"
 )
 

pkg/routing/route.go

@@ -5,8 +5,8 @@ package routing
 import (
 	"fmt"
 
-	"github.com/google/uuid"
 	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/google/uuid"
 )
 
 // Hop defines a route hop between 2 nodes.

pkg/routing/routing_table_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/routing/rule.go

@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/google/uuid"
 )
 
 // RuleHeaderSize represents the base size of a rule.

pkg/routing/rule_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/setup/node.go

@@ -12,9 +12,9 @@ import (
 	"github.com/SkycoinProject/dmsg/disc"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
 
-	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/metrics"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 )
 
 // Node performs routes setup operations over messaging channel.

pkg/setup/node_test.go

@@ -12,8 +12,8 @@ import (
 	"testing"
 	"time"
 
-"github.com/SkycoinProject/dmsg"
-"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/SkycoinProject/dmsg"
+	"github.com/SkycoinProject/dmsg/cipher"
 	"github.com/SkycoinProject/dmsg/disc"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/nettest"

pkg/therealssh/channel.go

@@ -12,8 +12,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/creack/pty"
 	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/creack/pty"
 
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
 )

pkg/therealssh/client.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/creack/pty"
 	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/creack/pty"
 
 	"github.com/SkycoinProject/skywire-mainnet/internal/netutil"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"

pkg/therealssh/pty_test.go

@@ -9,9 +9,9 @@ import (
 	"os/user"
 	"testing"
 
-	"github.com/creack/pty"
 	"github.com/SkycoinProject/dmsg/cipher"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/creack/pty"
 	"github.com/stretchr/testify/require"
 
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"

pkg/therealssh/session.go

@@ -11,8 +11,8 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/creack/pty"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/creack/pty"
 )
 
 // Log is the package level logger, which can be replaced from outside

pkg/transport-discovery/client/client.go

@@ -11,9 +11,9 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/google/uuid"
 	"github.com/SkycoinProject/dmsg/cipher"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/google/uuid"
 
 	"github.com/SkycoinProject/skywire-mainnet/internal/httpauth"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/transport"

pkg/transport/discovery.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/google/uuid"
 )
 
 // DiscoveryClient performs Transport discovery operations.

pkg/transport/entry.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/google/uuid"
 	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/google/uuid"
 )
 
 // Entry is the unsigned representation of a Transport.

pkg/transport/handshake.go

@@ -7,8 +7,9 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 	"github.com/SkycoinProject/dmsg/cipher"
+
+	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 )
 
 func makeEntry(pk1, pk2 cipher.PubKey, tpType string) Entry {

pkg/transport/managed_transport.go

@@ -8,8 +8,9 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
-	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
+
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 
 	"github.com/SkycoinProject/dmsg/cipher"
 	"github.com/SkycoinProject/skycoin/src/util/logging"

pkg/transport/manager.go

@@ -7,12 +7,12 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 
-	"github.com/google/uuid"
 	"github.com/SkycoinProject/dmsg/cipher"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/google/uuid"
 )
 
 // ManagerConfig configures a Manager.