Fix RPCGateway tests

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

@@ -1,29 +1,30 @@
-package appcommon
+package appserver
 
 import (
 	"fmt"
-	"github.com/skycoin/skywire/pkg/app2/appserver"
 	"io"
 	"os/exec"
 	"path/filepath"
 
+	"github.com/skycoin/skywire/pkg/app2/appcommon"
+
 	"github.com/skycoin/skycoin/src/util/logging"
 )
 
 // Proc is a wrapper for a skywire app. Encapsulates
 // the running proccess itself and the RPC server for
 // app/visor communication.
 type Proc struct {
-	key    Key
-	config Config
+	key    appcommon.Key
+	config appcommon.Config
 	log    *logging.Logger
-	rpcS   *appserver.Server
+	rpcS   *Server
 	cmd    *exec.Cmd
 }
 
 // NewProc constructs `Proc`.
-func NewProc(log *logging.Logger, c Config, args []string, stdout, stderr io.Writer) (*Proc, error) {
-	key := GenerateAppKey()
+func NewProc(log *logging.Logger, c appcommon.Config, args []string, stdout, stderr io.Writer) (*Proc, error) {
+	key := appcommon.GenerateAppKey()
 
 	binaryPath := getBinaryPath(c.BinaryDir, c.Name, c.Version)
 
@@ -44,7 +45,7 @@ func NewProc(log *logging.Logger, c Config, args []string, stdout, stderr io.Wri
 	cmd.Stdout = stdout
 	cmd.Stderr = stderr
 
-	rpcS, err := appserver.New(logging.MustGetLogger(fmt.Sprintf("app_rpc_server_%s", key)),
+	rpcS, err := New(logging.MustGetLogger(fmt.Sprintf("app_rpc_server_%s", key)),
 		c.SockFile, key)
 	if err != nil {
 		return nil, err

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

@@ -1,12 +1,12 @@
-package appcommon
+package appserver
 
 import (
 	"fmt"
 	"io"
 	"os/exec"
 	"sync"
 
-	"github.com/skycoin/skywire/pkg/app2/apputil"
+	"github.com/skycoin/skywire/pkg/app2/appcommon"
 
 	"github.com/pkg/errors"
 
@@ -34,8 +34,8 @@ 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) (ProcID, error) {
+func (m *ProcManager) Run(log *logging.Logger, c appcommon.Config, args []string,
+	stdout, stderr io.Writer) (appcommon.ProcID, error) {
 	if m.Exists(c.Name) {
 		return 0, errAppAlreadyExists
 	}
@@ -60,12 +60,12 @@ func (m *ProcManager) Run(log *logging.Logger, c Config, args []string,
 	m.procs[c.Name] = p
 	m.mx.Unlock()
 
-	return apputil.ProcID(p.cmd.Process.Pid), nil
+	return appcommon.ProcID(p.cmd.Process.Pid), nil
 }
 
 // Exists check whether app exists in the manager instance.
 func (m *ProcManager) Exists(name string) bool {
-	m.mx.RUnlock()
+	m.mx.RLock()
 	defer m.mx.RUnlock()
 
 	_, ok := m.procs[name]

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

@@ -1,12 +1,11 @@
-package appcommon
+package appserver
 
 import (
 	"sort"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/skycoin/skycoin/src/util/logging"
+	"github.com/stretchr/testify/require"
 )
 
 func TestProcManager_Exists(t *testing.T) {