Make ProcManager an interface, generate mock

skycoin · Nov 8, 2019 · cd541db · cd541db
1 parent d0656e3
commit cd541db
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 12 deletions.
diff --git a/pkg/app/appserver/mock_proc_manager.go b/pkg/app/appserver/mock_proc_manager.go
diff --git a/pkg/app/appserver/proc_manager.go b/pkg/app/appserver/proc_manager.go
@@ -13,28 +13,40 @@ import (
 	"github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon"
 )
 
+//go:generate mockery -name ProcManager -case underscore -inpkg
+
 var (
 	errAppAlreadyExists = errors.New("app already exists")
 	errNoSuchApp        = errors.New("no such app")
 )
 
 // ProcManager allows to manage skywire applications.
-type ProcManager struct {
+type ProcManager interface {
+	Run(log *logging.Logger, c appcommon.Config, args []string, stdout, stderr io.Writer) (appcommon.ProcID, error)
+	Exists(name string) bool
+	Stop(name string) error
+	Wait(name string) error
+	Range(next func(name string, proc *Proc) bool)
+}
+
+// procManager allows to manage skywire applications.
+// Implements `ProcManager`.
+type procManager struct {
 	log   *logging.Logger
 	procs map[string]*Proc
 	mx    sync.RWMutex
 }
 
 // NewProcManager constructs `ProcManager`.
-func NewProcManager(log *logging.Logger) *ProcManager {
-	return &ProcManager{
+func NewProcManager(log *logging.Logger) ProcManager {
+	return &procManager{
 		log:   log,
 		procs: make(map[string]*Proc),
 	}
 }
 
 // Run runs the application according to its config and additional args.
-func (m *ProcManager) Run(log *logging.Logger, c appcommon.Config, args []string,
+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
@@ -64,7 +76,7 @@ func (m *ProcManager) Run(log *logging.Logger, c appcommon.Config, args []string
 }
 
 // Exists check whether app exists in the manager instance.
-func (m *ProcManager) Exists(name string) bool {
+func (m *procManager) Exists(name string) bool {
 	m.mx.RLock()
 	defer m.mx.RUnlock()
 
@@ -73,7 +85,7 @@ func (m *ProcManager) Exists(name string) bool {
 }
 
 // Stop stops the application.
-func (m *ProcManager) Stop(name string) error {
+func (m *procManager) Stop(name string) error {
 	p, err := m.pop(name)
 	if err != nil {
 		return err
@@ -83,7 +95,7 @@ func (m *ProcManager) Stop(name string) error {
 }
 
 // Wait waits for the application to exit.
-func (m *ProcManager) Wait(name string) error {
+func (m *procManager) Wait(name string) error {
 	p, err := m.pop(name)
 	if err != nil {
 		return err
@@ -102,7 +114,7 @@ func (m *ProcManager) Wait(name string) error {
 
 // Range allows to iterate over running skywire apps. Calls `next` on
 // each iteration. If `next` returns falls - stops iteration.
-func (m *ProcManager) Range(next func(name string, proc *Proc) bool) {
+func (m *procManager) Range(next func(name string, proc *Proc) bool) {
 	m.mx.RLock()
 	defer m.mx.RUnlock()
 
@@ -114,7 +126,7 @@ func (m *ProcManager) Range(next func(name string, proc *Proc) bool) {
 }
 
 // pop removes application from the manager instance and returns it.
-func (m *ProcManager) pop(name string) (*Proc, error) {
+func (m *procManager) pop(name string) (*Proc, error) {
 	m.mx.Lock()
 	defer m.mx.Unlock()
 

diff --git a/pkg/app/client.go b/pkg/app/client.go
@@ -33,8 +33,6 @@ type ClientConfig struct {
 	AppKey   appcommon.Key
 }
 
-// TODO: move env names to constants
-
 // ClientConfigFromEnv creates client config from the ENV args.
 func ClientConfigFromEnv() (ClientConfig, error) {
 	appKey := os.Getenv(appcommon.EnvAppKey)

diff --git a/pkg/visor/visor.go b/pkg/visor/visor.go
@@ -89,7 +89,7 @@ type Node struct {
 	rpcListener net.Listener
 	rpcDialers  []*noise.RPCClientDialer
 
-	procManager *appserver.ProcManager
+	procManager appserver.ProcManager
 }
 
 // NewNode constructs new Node.