fix CI errors

cmd/apps/skychat/commands/skychat.go

@@ -277,8 +277,10 @@ func sseHandler(w http.ResponseWriter, req *http.Request) {
 			if !ok {
 				return
 			}
-			_, _ = fmt.Fprintf(w, "data: %s\n\n", msg)
-			f.Flush()
+			_, err := fmt.Fprintf(w, "data: %s\n\n", msg)
+			if err == nil {
+				f.Flush()
+			}
 
 		case <-req.Context().Done():
 			fmt.Print("SSE connection were closed.")

cmd/apps/vpn-server/commands/vpn-server.go

@@ -56,7 +56,7 @@ var RootCmd = &cobra.Command{
 	DisableSuggestions:    true,
 	DisableFlagsInUseLine: true,
 	Version:               buildinfo.Version(),
-	Run: func(cmd *cobra.Command, args []string) {
+	Run: func(_ *cobra.Command, _ []string) {
 		appCl := app.NewClient(nil)
 		defer appCl.Close()
 

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

@@ -158,7 +158,7 @@ func init() {
 	}
 	genConfigCmd.Flags().VarP(&sk, "sk", "s", "a random key is generated if unspecified\n\r")
 	gHiddenFlags = append(gHiddenFlags, "sk")
-	genConfigCmd.Flags().BoolVarP(&isTestEnv, "testenv", "t", scriptExecBool("${TESTENV:-false}"), "use test deployment "+testConf+"\033[0m")
+	genConfigCmd.Flags().BoolVarP(&isTestEnv, "testenv", "t", scriptExecBool("${TESTENV:-false}"), "use test deployment\033[0m")
 	gHiddenFlags = append(gHiddenFlags, "testenv")
 	genConfigCmd.Flags().BoolVarP(&isVpnServerEnable, "servevpn", "v", scriptExecBool("${VPNSERVER:-false}"), "enable vpn server\033[0m")
 	gHiddenFlags = append(gHiddenFlags, "servevpn")
@@ -521,7 +521,6 @@ var genConfigCmd = &cobra.Command{
 			}
 		}
 
-
 		//generate the common config containing public & secret keys
 		u := buildinfo.Version()
 		x := u

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

@@ -55,8 +55,8 @@ var (
 	disableApps                 string
 	isBestProtocol              bool
 	serviceConfURL              = "http://conf.skywire.skycoin.com"
-	testServiceConfURL              = "http://conf.skywire.dev"
-	dnsServer = "1.1.1.1"
+	testServiceConfURL          = "http://conf.skywire.dev"
+	dnsServer                   = "1.1.1.1"
 	services                    visorconfig.Services
 	servicesConfig              servicesConf
 	isForce                     bool

cmd/skywire-cli/commands/config/update.go

@@ -12,6 +12,7 @@ import (
 	coinCipher "github.com/skycoin/skycoin/src/cipher"
 	"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"
@@ -31,8 +32,8 @@ func init() {
 	updateCmd.Flags().SortFlags = false
 	updateCmd.Flags().BoolVarP(&isUpdateEndpoints, "endpoints", "a", false, "update server endpoints")
 	updateCmd.Flags().StringVar(&logLevel, "log-level", "", "level of logging in config")
-	updateCmd.Flags().StringVarP(&serviceConfURL, "url", "b", "", "service config URL: "+svcConf)
-	updateCmd.Flags().BoolVarP(&isTestEnv, "testenv", "t", false, "use test deployment: "+testConf)
+	updateCmd.Flags().StringVarP(&serviceConfURL, "url", "b", skywire.ConfService, "service config URL")
+	updateCmd.Flags().BoolVarP(&isTestEnv, "testenv", "t", false, "use test deployment")
 	updateCmd.Flags().StringVar(&setPublicAutoconnect, "public-autoconn", "", "change public autoconnect configuration")
 	updateCmd.Flags().IntVar(&minHops, "set-minhop", -1, "change min hops value")
 	updateCmd.PersistentFlags().StringVarP(&input, "input", "i", "", "path of input config file.")
@@ -91,9 +92,9 @@ var updateCmd = &cobra.Command{
 	PreRun: func(_ *cobra.Command, _ []string) {
 		if isUpdateEndpoints && (serviceConfURL == "") {
 			if !isTestEnv {
-				serviceConfURL = svcConf
+				serviceConfURL = skywire.ConfService
 			} else {
-				serviceConfURL = testConf
+				serviceConfURL = skywire.ConfServiceTest
 			}
 		}
 		setDefaults()
@@ -106,7 +107,7 @@ var updateCmd = &cobra.Command{
 		conf = initUpdate()
 		if isUpdateEndpoints {
 			if isTestEnv {
-				serviceConfURL = testConf
+				serviceConfURL = skywire.ConfServiceTest
 			}
 			mLog := logging.NewMasterLogger()
 			mLog.SetLevel(logrus.InfoLevel)

cmd/skywire-cli/commands/log/log.go

@@ -29,10 +29,9 @@ import (
 )
 
 func init() {
-	log := logging.MustGetLogger("skywire-cli")
 	var envServices skywire.EnvServices
 	var services skywire.Services
-	if err := json.Unmarshal([]byte(jsonData), &envServices); err == nil {
+	if err := json.Unmarshal([]byte(skywire.ServicesJSON), &envServices); err == nil {
 		if err := json.Unmarshal(envServices.Prod, &services); err == nil {
 			dmsgDiscURL = services.DmsgDiscovery
 			utURL = services.UptimeTracker

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

@@ -6,8 +6,8 @@ import (
 )
 
 var (
-	dmsgDiscURL string
-	utURL string
+	dmsgDiscURL    string
+	utURL          string
 	pubKey         string
 	duration       int
 	minv           string

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

@@ -4,6 +4,7 @@ package climdisc
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"os"
@@ -16,6 +17,7 @@ import (
 	"github.com/spf13/cobra"
 	"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"
@@ -26,22 +28,19 @@ var (
 	cacheFilesAge  int
 	mdURL          string
 	isStats        bool
-	dmsgDiscURL string
-
+	dmsgDiscURL    string
 )
 
 // var allEntries bool
 var masterLogger = logging.NewMasterLogger()
 var packageLogger = masterLogger.PackageLogger("mdisc:disc")
 
 func init() {
-	log := logging.MustGetLogger("skywire-cli")
 	var envServices skywire.EnvServices
 	var services skywire.Services
-	if err := json.Unmarshal([]byte(jsonData), &envServices); err == nil {
+	if err := json.Unmarshal([]byte(skywire.ServicesJSON), &envServices); err == nil {
 		if err := json.Unmarshal(envServices.Prod, &services); err == nil {
 			dmsgDiscURL = services.DmsgDiscovery
-			utURL = services.UptimeTracker
 		}
 	}
 	RootCmd.AddCommand(

cmd/skywire-cli/commands/proxy/proxy.go

@@ -4,6 +4,7 @@ package skysocksc
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"os"
 	"strings"
@@ -15,6 +16,7 @@ import (
 	"github.com/spf13/cobra"
 	"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"
@@ -257,10 +259,9 @@ var statusCmd = &cobra.Command{
 var isLabel bool
 
 func init() {
-	log := logging.MustGetLogger("skywire-cli")
 	var envServices skywire.EnvServices
 	var services skywire.Services
-	if err := json.Unmarshal([]byte(jsonData), &envServices); err == nil {
+	if err := json.Unmarshal([]byte(skywire.ServicesJSON), &envServices); err == nil {
 		if err := json.Unmarshal(envServices.Prod, &services); err == nil {
 			svcDiscURL = services.DmsgDiscovery
 			utURL = services.UptimeTracker

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

@@ -32,8 +32,7 @@ var (
 	addr            string
 	startingTimeout int
 	httpAddr        string
-	svcDiscURL string
-	utURL string
+	svcDiscURL      string
 )
 
 // RootCmd contains commands that interact with the skywire-visor

cmd/skywire-cli/commands/rewards/ui.go

@@ -6,6 +6,7 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/csv"
+	"encoding/json"
 	"fmt"
 	htmpl "html/template"
 	"io"
@@ -29,16 +30,16 @@ import (
 	dmsg "github.com/skycoin/dmsg/pkg/dmsg"
 	"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"
 )
 
 func init() {
-	log := logging.MustGetLogger("skywire-cli")
 	var envServices skywire.EnvServices
 	var services skywire.Services
-	if err := json.Unmarshal([]byte(jsonData), &envServices); err == nil {
+	if err := json.Unmarshal([]byte(skywire.ServicesJSON), &envServices); err == nil {
 		if err := json.Unmarshal(envServices.Prod, &services); err == nil {
 			dmsgDiscURL = services.DmsgDiscovery
 		}
@@ -100,8 +101,7 @@ var (
 	wlkeys          []cipher.PubKey
 	webPort         uint
 	ensureOnlineURL string
-	dmsgDiscURL string
-
+	dmsgDiscURL     string
 )
 
 var skyenvfile = os.Getenv("SKYENV")

cmd/skywire-cli/commands/route/route.go

@@ -3,6 +3,7 @@ package cliroute
 
 import (
 	"bytes"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -17,32 +18,31 @@ import (
 	"github.com/spf13/pflag"
 	"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-utilities/pkg/logging"
 	"github.com/skycoin/skywire/pkg/skyenv"
 	"github.com/skycoin/skywire/pkg/visor/visorconfig"
 )
 
 var (
-	frAddr string
- frMinHops, frMaxHops uint16
- timeout time.Duration
- skywireconfig string
- rfURL string
+	frAddr               string
+	frMinHops, frMaxHops uint16
+	timeout              time.Duration
+	skywireconfig        string
+	rfURL                string
 )
 
 func init() {
-	log := logging.MustGetLogger("skywire-cli")
 	var envServices skywire.EnvServices
 	var services skywire.Services
-	if err := json.Unmarshal([]byte(jsonData), &envServices); err == nil {
+	if err := json.Unmarshal([]byte(skywire.ServicesJSON), &envServices); err == nil {
 		if err := json.Unmarshal(envServices.Prod, &services); err == nil {
-			rfURL = services.RouteFinderAddr
+			rfURL = services.RouteFinder
 		}
 	}
 	findCmd.Flags().SortFlags = false

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

@@ -12,6 +12,7 @@ import (
 	"github.com/skycoin/dmsg/pkg/dmsg"
 	"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"
@@ -32,14 +33,13 @@ var (
 	pkgconfigexists  bool
 	userconfigexists bool
 	conf             *visorconfig.V1
-	dmsgDiscURL string
+	dmsgDiscURL      string
 )
 
 func init() {
-	log := logging.MustGetLogger("skywire-cli")
 	var envServices skywire.EnvServices
 	var services skywire.Services
-	if err := json.Unmarshal([]byte(jsonData), &envServices); err == nil {
+	if err := json.Unmarshal([]byte(skywire.ServicesJSON), &envServices); err == nil {
 		if err := json.Unmarshal(envServices.Prod, &services); err == nil {
 			dmsgDiscURL = services.DmsgDiscovery
 		}

cmd/skywire-cli/commands/tp/tp.go

@@ -3,6 +3,7 @@ package clitp
 
 import (
 	"bytes"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"os"
@@ -20,6 +21,7 @@ import (
 	"github.com/spf13/pflag"
 	"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"
@@ -36,16 +38,15 @@ var (
 	logger        = logging.MustGetLogger("skywire-cli")
 	removeAll     bool
 	tpTypes       bool
-	tpDiscURL string
-	sdURL string
-	utURL string
+	tpDiscURL     string
+	sdURL         string
+	utURL         string
 )
 
 func init() {
-	log := logging.MustGetLogger("skywire-cli")
 	var envServices skywire.EnvServices
 	var services skywire.Services
-	if err := json.Unmarshal([]byte(jsonData), &envServices); err == nil {
+	if err := json.Unmarshal([]byte(skywire.ServicesJSON), &envServices); err == nil {
 		if err := json.Unmarshal(envServices.Prod, &services); err == nil {
 			tpDiscURL = services.TransportDiscovery
 			sdURL = services.ServiceDiscovery
@@ -121,7 +122,6 @@ var tpCmd = &cobra.Command{
 
 var (
 	sortedEdgeKeys []string
-	utURL          string
 	tpdURL         string
 	rootNode       string
 	lastNode       string
@@ -138,7 +138,6 @@ var (
 	transportType  string
 	timeout        time.Duration
 	rpk            string
-	sdURL          string
 	cacheFileSD    string
 	cacheFilesAge  int
 	forceAttempt   bool

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

@@ -2,12 +2,14 @@
 package cliut
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 
 	"github.com/bitfield/script"
 	"github.com/spf13/cobra"
 
+	"github.com/skycoin/skywire"
 	"github.com/skycoin/skywire/cmd/skywire-cli/internal"
 )
 
@@ -27,10 +29,9 @@ var (
 var minUT int
 
 func init() {
-	log := logging.MustGetLogger("skywire-cli")
 	var envServices skywire.EnvServices
 	var services skywire.Services
-	if err := json.Unmarshal([]byte(jsonData), &envServices); err == nil {
+	if err := json.Unmarshal([]byte(skywire.ServicesJSON), &envServices); err == nil {
 		if err := json.Unmarshal(envServices.Prod, &services); err == nil {
 			utURL = services.UptimeTracker
 		}
@@ -48,7 +49,7 @@ func init() {
 var utCmd = &cobra.Command{
 	Use:   "ut",
 	Short: "query uptime tracker",
-	Long:  fmt.Sprintf("query uptime tracker\n\n%v/uptimes?v=v2\n\nCheck local visor daily uptime percent with:\n skywire-cli ut -k $(skywire-cli visor pk)n\nSet cache file location to \"\" to avoid using cache files", utilenv.UptimeTrackerAddr),
+	Long:  fmt.Sprintf("query uptime tracker\n\n%v/uptimes?v=v2\n\nCheck local visor daily uptime percent with:\n skywire-cli ut -k $(skywire-cli visor pk)n\nSet cache file location to \"\" to avoid using cache files", utURL),
 	Run: func(cmd *cobra.Command, _ []string) {
 		uts := internal.GetData(cacheFileUT, utURL+"/uptimes?v=v2", cacheFilesAge)
 		if online {