Integrate m3 dsmgpty with hypervisor and various fixes.

Makefile

@@ -120,7 +120,6 @@ bin: ## Build `skywire-visor`, `skywire-cli`, `hypervisor`
 	${OPTS} go build ${BUILD_OPTS} -o ./skywire-cli  ./cmd/skywire-cli
 	${OPTS} go build ${BUILD_OPTS} -o ./setup-node ./cmd/setup-node
 	${OPTS} go build ${BUILD_OPTS} -o ./hypervisor ./cmd/hypervisor
-	${OPTS} go build ${BUILD_OPTS} -o ./dmsgpty ./cmd/dmsgpty
 
 release: ## Build `skywire-visor`, `skywire-cli`, `hypervisor` and apps without -race flag
 	${OPTS} go build ${BUILD_OPTS} -o ./skywire-visor ./cmd/skywire-visor
@@ -186,21 +185,6 @@ run-syslog: ## Run syslog-ng in docker. Logs are mounted under /tmp/syslog
 	-docker container rm syslog-ng -f
 	docker run -d -p 514:514/udp  -v /tmp/syslog:/var/log  --name syslog-ng balabit/syslog-ng:latest 
 
-integration-startup: ## Starts up the required transports between `skywire-visor`s of interactive testing environment
-	./integration/startup.sh
-
-integration-teardown: ## Tears down all saved configs and states of integration executables
-	./integration/tear-down.sh
-
-integration-run-generic: ## Runs the generic interactive testing environment
-	./integration/run-generic-env.sh
-
-integration-run-messaging: ## Runs the messaging interactive testing environment
-	./integration/run-messaging-env.sh
-
-integration-run-proxy: ## Runs the proxy interactive testing environment
-	./integration/run-proxy-env.sh
-
 mod-comm: ## Comments the 'replace' rule in go.mod
 	./ci_scripts/go_mod_replace.sh comment go.mod
 

cmd/hypervisor/commands/root.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/SkycoinProject/dmsg"
 	"github.com/SkycoinProject/dmsg/disc"
-
 	"github.com/SkycoinProject/skycoin/src/util/logging"
 	"github.com/spf13/cobra"
 
@@ -49,67 +48,70 @@ var rootCmd = &cobra.Command{
 			log.Printf("Failed to output build info: %v", err)
 		}
 
-		if configPath == "" {
-			configPath = pathutil.FindConfigPath(args, -1, configEnv, pathutil.HypervisorDefaults())
-		}
-
-		var config hypervisor.Config
-		config.FillDefaults()
-		if err := config.Parse(configPath); err != nil {
-			log.WithError(err).Fatalln("failed to parse config file")
-		}
-
-		fmt.Println("Config: \n", config)
-
-		var (
-			httpAddr = config.Interfaces.HTTPAddr
-			rpcAddr  = config.Interfaces.RPCAddr
-		)
+		conf := prepareConfig(args)
 
-		m, err := hypervisor.New(config)
+		// Prepare hypervisor.
+		hv, err := hypervisor.New(conf)
 		if err != nil {
 			log.Fatalln("Failed to start hypervisor:", err)
 		}
+		if mock {
+			prepareMockData(hv)
+		} else {
+			prepareDmsg(hv, conf)
+		}
 
-		log.Infof("serving RPC on '%s'", rpcAddr)
-		go func() {
-			_, rpcPort, err := config.Interfaces.SplitRPCAddr()
-			if err != nil {
-				log.Fatalln("Failed to parse rpc port from rpc address:", err)
-			}
-
-			dmsgC := dmsg.NewClient(config.PK, config.SK, disc.NewHTTP(config.DmsgDiscovery), dmsg.DefaultConfig())
-			go dmsgC.Serve()
+		// Serve HTTP.
+		log.WithField("http_addr", conf.HTTPAddr).Info("Serving HTTP.")
+		if err := http.ListenAndServe(conf.HTTPAddr, hv); err != nil {
+			log.WithError(err).Fatal("Hypervisor exited with error.")
+		}
+		log.Info("Good bye!")
+	},
+}
 
-			l, err := dmsgC.Listen(rpcPort)
-			if err != nil {
-				log.Fatalln("Failed to bind tcp port:", err)
-			}
+func prepareConfig(args []string) (conf hypervisor.Config) {
+	if configPath == "" {
+		configPath = pathutil.FindConfigPath(args, -1, configEnv, pathutil.HypervisorDefaults())
+	}
+	conf.FillDefaults(mock)
+	if err := conf.Parse(configPath); err != nil {
+		log.WithError(err).Fatalln("failed to parse config file")
+	}
+	log.WithField("config", conf).Info()
+	return conf
+}
 
-			if err := m.ServeRPC(l); err != nil {
-				log.Fatalln("Failed to serve RPC:", err)
-			}
-		}()
+func prepareMockData(hv *hypervisor.Hypervisor) {
+	err := hv.AddMockData(hypervisor.MockConfig{
+		Visors:            mockVisors,
+		MaxTpsPerVisor:    mockMaxTps,
+		MaxRoutesPerVisor: mockMaxRoutes,
+		EnableAuth:        mockEnableAuth,
+	})
+	if err != nil {
+		log.Fatalln("Failed to add mock data:", err)
+	}
+}
 
-		if mock {
-			err := m.AddMockData(hypervisor.MockConfig{
-				Visors:            mockVisors,
-				MaxTpsPerVisor:    mockMaxTps,
-				MaxRoutesPerVisor: mockMaxRoutes,
-				EnableAuth:        mockEnableAuth,
-			})
-			if err != nil {
-				log.Fatalln("Failed to add mock data:", err)
-			}
-		}
+func prepareDmsg(hv *hypervisor.Hypervisor, conf hypervisor.Config) {
+	// Prepare dmsg client.
+	dmsgC := dmsg.NewClient(conf.PK, conf.SK, disc.NewHTTP(conf.DmsgDiscovery), dmsg.DefaultConfig())
+	go dmsgC.Serve()
 
-		log.Infof("serving HTTP on '%s'", httpAddr)
-		if err := http.ListenAndServe(httpAddr, m); err != nil {
-			log.Fatalln("Hypervisor exited with error:", err)
+	dmsgL, err := dmsgC.Listen(conf.DmsgPort)
+	if err != nil {
+		log.WithField("addr", fmt.Sprintf("dmsg://%s:%d", conf.PK, conf.DmsgPort)).
+			Fatal("Failed to listen over dmsg.")
+	}
+	go func() {
+		if err := hv.ServeRPC(dmsgC, dmsgL); err != nil {
+			log.WithError(err).
+				Fatal("Failed to serve RPC client over dmsg.")
 		}
-
-		log.Println("Good bye!")
-	},
+	}()
+	log.WithField("addr", fmt.Sprintf("dmsg://%s:%d", conf.PK, conf.DmsgPort)).
+		Info("Serving RPC client over dmsg.")
 }
 
 // Execute executes root CLI command.

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

@@ -154,7 +154,7 @@ func defaultConfig() *visor.Config {
 
 func defaultDmsgPtyConfig() visor.DmsgPtyConfig {
 	return visor.DmsgPtyConfig{
-		Port:     skyenv.DefaultDmsgPtyPort,
+		Port:     skyenv.DmsgPtyPort,
 		AuthFile: "./skywire/dmsgpty/whitelist.json",
 		CLINet:   skyenv.DefaultDmsgPtyCLINet,
 		CLIAddr:  skyenv.DefaultDmsgPtyCLIAddr,

go.mod

@@ -3,14 +3,12 @@ module github.com/SkycoinProject/skywire-mainnet
 go 1.13
 
 require (
-	github.com/SkycoinProject/dmsg v0.0.0-20200303104641-cfc70993f6b0
+	github.com/SkycoinProject/dmsg v0.0.0-20200304081751-cf4d40f5428f
 	github.com/SkycoinProject/skycoin v0.27.0
 	github.com/SkycoinProject/yamux v0.0.0-20191213015001-a36efeefbf6a
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
-	github.com/creack/pty v1.1.9
 	github.com/go-chi/chi v4.0.2+incompatible
 	github.com/google/uuid v1.1.1
-	github.com/gorilla/handlers v1.4.2
 	github.com/gorilla/securecookie v1.1.1
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/kr/pretty v0.2.0 // indirect
@@ -24,7 +22,7 @@ require (
 	github.com/spf13/cobra v0.0.5
 	github.com/stretchr/testify v1.4.0
 	go.etcd.io/bbolt v1.3.3
-	golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073
+	golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 // indirect
 	golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a
 	golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 // indirect
 )