chore(all): return concrete types, accept interfaces

- Remove exported interfaces unused locally
- Define interfaces to accept arguments
- Return concrete types, not interfaces

internal/portforward/state/portforwarded.go

@@ -1,14 +1,5 @@
 package state
 
-type PortForwardedGetterSetter interface {
-	PortForwardedGetter
-	SetPortForwarded(port uint16)
-}
-
-type PortForwardedGetter interface {
-	GetPortForwarded() (port uint16)
-}
-
 // GetPortForwarded is used by the control HTTP server
 // to obtain the port currently forwarded.
 func (s *State) GetPortForwarded() (port uint16) {

internal/portforward/state/settings.go

@@ -9,12 +9,6 @@ import (
 	"github.com/qdm12/gluetun/internal/constants"
 )
 
-type SettingsGetSetter interface {
-	GetSettings() (settings settings.PortForwarding)
-	SetSettings(ctx context.Context,
-		settings settings.PortForwarding) (outcome string)
-}
-
 func (s *State) GetSettings() (settings settings.PortForwarding) {
 	s.settingsMu.RLock()
 	defer s.settingsMu.RUnlock()

internal/portforward/state/startdata.go

@@ -13,25 +13,12 @@ type StartData struct {
 	Interface     string // tun0 for example
 }
 
-type StartDataGetterSetter interface {
-	StartDataGetter
-	StartDataSetter
-}
-
-type StartDataGetter interface {
-	GetStartData() (startData StartData)
-}
-
 func (s *State) GetStartData() (startData StartData) {
 	s.startDataMu.RLock()
 	defer s.startDataMu.RUnlock()
 	return s.startData
 }
 
-type StartDataSetter interface {
-	SetStartData(startData StartData)
-}
-
 func (s *State) SetStartData(startData StartData) {
 	s.startDataMu.Lock()
 	defer s.startDataMu.Unlock()

internal/portforward/state/state.go

@@ -1,21 +1,14 @@
 package state
 
 import (
+	"context"
 	"sync"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/loopstate"
+	"github.com/qdm12/gluetun/internal/models"
 )
 
-var _ Manager = (*State)(nil)
-
-type Manager interface {
-	SettingsGetSetter
-	PortForwardedGetterSetter
-	StartDataGetterSetter
-}
-
-func New(statusApplier loopstate.Applier,
+func New(statusApplier StatusApplier,
 	settings settings.PortForwarding) *State {
 	return &State{
 		statusApplier: statusApplier,
@@ -24,7 +17,7 @@ func New(statusApplier loopstate.Applier,
 }
 
 type State struct {
-	statusApplier loopstate.Applier
+	statusApplier StatusApplier
 
 	settings   settings.PortForwarding
 	settingsMu sync.RWMutex
@@ -35,3 +28,8 @@ type State struct {
 	startData   StartData
 	startDataMu sync.RWMutex
 }
+
+type StatusApplier interface {
+	ApplyStatus(ctx context.Context, status models.LoopStatus) (
+		outcome string, err error)
+}