Change package structure

pkg/app2/appserver/config.go → pkg/app2/appcommon/config.go

@@ -1,4 +1,4 @@
-package appserver
+package appcommon
 
 // Config defines configuration parameters for `Proc`.
 type Config struct {

pkg/app2/appserver/key.go → pkg/app2/appcommon/key.go

@@ -1,4 +1,4 @@
-package appserver
+package appcommon
 
 import "github.com/skycoin/dmsg/cipher"
 

pkg/app2/appserver/proc.go → pkg/app2/appcommon/proc.go

@@ -1,7 +1,8 @@
-package appserver
+package appcommon
 
 import (
 	"fmt"
+	"github.com/skycoin/skywire/pkg/app2/appserver"
 	"io"
 	"os/exec"
 	"path/filepath"
@@ -16,7 +17,7 @@ type Proc struct {
 	key    Key
 	config Config
 	log    *logging.Logger
-	rpcS   *Server
+	rpcS   *appserver.Server
 	cmd    *exec.Cmd
 }
 
@@ -43,7 +44,7 @@ func NewProc(log *logging.Logger, c Config, args []string, stdout, stderr io.Wri
 	cmd.Stdout = stdout
 	cmd.Stderr = stderr
 
-	rpcS, err := New(logging.MustGetLogger(fmt.Sprintf("app_rpc_server_%s", key)),
+	rpcS, err := appserver.New(logging.MustGetLogger(fmt.Sprintf("app_rpc_server_%s", key)),
 		c.SockFile, key)
 	if err != nil {
 		return nil, err

pkg/app2/appserver/proc_manager.go → pkg/app2/appcommon/proc_manager.go

@@ -1,4 +1,4 @@
-package appserver
+package appcommon
 
 import (
 	"fmt"
@@ -35,7 +35,7 @@ func NewProcManager(log *logging.Logger) *ProcManager {
 
 // Run runs the application according to its config and additional args.
 func (m *ProcManager) Run(log *logging.Logger, c Config, args []string,
-	stdout, stderr io.Writer) (apputil.ProcID, error) {
+	stdout, stderr io.Writer) (ProcID, error) {
 	if m.Exists(c.Name) {
 		return 0, errAppAlreadyExists
 	}

pkg/app2/appserver/proc_manager_test.go → pkg/app2/appcommon/proc_manager_test.go

@@ -1,4 +1,4 @@
-package appserver
+package appcommon
 
 import (
 	"sort"

pkg/app2/apputil/procid.go → pkg/app2/appcommon/procid.go

@@ -1,4 +1,4 @@
-package apputil
+package appcommon
 
 // ProcID identifies the current instance of an app (an app process).
 // The visor node is responsible for starting apps, and the started process

pkg/app2/appserver/server.go

@@ -2,6 +2,7 @@ package appserver
 
 import (
 	"fmt"
+	"github.com/skycoin/skywire/pkg/app2/appcommon"
 	"net"
 	"net/rpc"
 	"sync"
@@ -21,7 +22,7 @@ type Server struct {
 }
 
 // NewServer constructs server.
-func New(log *logging.Logger, sockFile string, appKey Key) (*Server, error) {
+func New(log *logging.Logger, sockFile string, appKey appcommon.Key) (*Server, error) {
 	rpcS := rpc.NewServer()
 	gateway := newRPCGateway(logging.MustGetLogger(fmt.Sprintf("rpc_server_%s", appKey)))
 	if err := rpcS.RegisterName(string(appKey), gateway); err != nil {

pkg/app2/client.go

@@ -1,12 +1,11 @@
 package app2
 
 import (
+	"github.com/skycoin/skywire/pkg/app2/appcommon"
 	"net"
 	"net/rpc"
 	"os"
 
-	"github.com/skycoin/skywire/pkg/app2/appserver"
-
 	"github.com/pkg/errors"
 	"github.com/skycoin/dmsg/cipher"
 	"github.com/skycoin/skycoin/src/util/logging"
@@ -31,7 +30,7 @@ var (
 type ClientConfig struct {
 	VisorPK  cipher.PubKey
 	SockFile string
-	AppKey   appserver.Key
+	AppKey   appcommon.Key
 }
 
 // ClientConfigFromEnv creates client config from the ENV args.
@@ -59,7 +58,7 @@ func ClientConfigFromEnv() (ClientConfig, error) {
 	return ClientConfig{
 		VisorPK:  visorPK,
 		SockFile: sockFile,
-		AppKey:   appserver.Key(appKey),
+		AppKey:   appcommon.Key(appKey),
 	}, nil
 }
 

pkg/app2/rpc_client.go

@@ -2,6 +2,7 @@ package app2
 
 import (
 	"fmt"
+	"github.com/skycoin/skywire/pkg/app2/appcommon"
 	"net/rpc"
 
 	"github.com/skycoin/skywire/pkg/app2/appnet"
@@ -25,11 +26,11 @@ type RPCClient interface {
 // rpcClient implements `RPCClient`.
 type rpcCLient struct {
 	rpc    *rpc.Client
-	appKey appserver.Key
+	appKey appcommon.Key
 }
 
 // NewRPCClient constructs new `rpcClient`.
-func NewRPCClient(rpc *rpc.Client, appKey appserver.Key) RPCClient {
+func NewRPCClient(rpc *rpc.Client, appKey appcommon.Key) RPCClient {
 	return &rpcCLient{
 		rpc:    rpc,
 		appKey: appKey,

pkg/visor/visor.go

@@ -18,9 +18,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/skycoin/skywire/pkg/app2/apputil"
-
-	"github.com/skycoin/skywire/pkg/app2/appserver"
+	"github.com/skycoin/skywire/pkg/app2/appcommon"
 
 	"github.com/skycoin/skywire/pkg/snet"
 
@@ -99,7 +97,7 @@ type Node struct {
 	rpcListener net.Listener
 	rpcDialers  []*noise.RPCClientDialer
 
-	procManager *appserver.ProcManager
+	procManager *appcommon.ProcManager
 }
 
 // NewNode constructs new Node.
@@ -108,7 +106,7 @@ func NewNode(config *Config, masterLogger *logging.MasterLogger) (*Node, error)
 
 	node := &Node{
 		config:      config,
-		procManager: appserver.NewProcManager(logging.MustGetLogger("proc_manager")),
+		procManager: appcommon.NewProcManager(logging.MustGetLogger("proc_manager")),
 	}
 
 	node.Logger = masterLogger
@@ -333,7 +331,7 @@ func (node *Node) Close() (err error) {
 	}
 
 	var procs []string
-	node.procManager.Range(func(name string, _ *appserver.Proc) bool {
+	node.procManager.Range(func(name string, _ *appcommon.Proc) bool {
 		procs = append(procs, name)
 		return true
 	})
@@ -407,7 +405,7 @@ func (node *Node) SpawnApp(config *AppConfig, startCh chan<- struct{}) (err erro
 		return fmt.Errorf("can't bind to reserved port %d", config.Port)
 	}
 
-	appCfg := appserver.Config{
+	appCfg := appcommon.Config{
 		Name:      config.App,
 		Version:   config.Version,
 		BinaryDir: node.appsPath,
@@ -448,7 +446,7 @@ func (node *Node) SpawnApp(config *AppConfig, startCh chan<- struct{}) (err erro
 	return nil
 }
 
-func (node *Node) persistPID(name string, pid apputil.ProcID) {
+func (node *Node) persistPID(name string, pid appcommon.ProcID) {
 	pidF := node.pidFile()
 	pidFName := pidF.Name()
 	if err := pidF.Close(); err != nil {