chore(all): return concrete types, accept interfaces

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

internal/publicip/state/publicip.go

@@ -4,11 +4,6 @@ import (
 	"github.com/qdm12/gluetun/internal/publicip/models"
 )
 
-type DataGetSetter interface {
-	GetData() (data models.IPInfoData)
-	SetData(data models.IPInfoData)
-}
-
 func (s *State) GetData() (data models.IPInfoData) {
 	s.ipDataMu.RLock()
 	defer s.ipDataMu.RUnlock()

internal/publicip/state/settings.go

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

internal/publicip/state/state.go

@@ -1,21 +1,15 @@
 package state
 
 import (
+	"context"
 	"sync"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/loopstate"
-	"github.com/qdm12/gluetun/internal/publicip/models"
+	"github.com/qdm12/gluetun/internal/models"
+	publicipmodels "github.com/qdm12/gluetun/internal/publicip/models"
 )
 
-var _ Manager = (*State)(nil)
-
-type Manager interface {
-	SettingsGetSetter
-	DataGetSetter
-}
-
-func New(statusApplier loopstate.Applier,
+func New(statusApplier StatusApplier,
 	settings settings.PublicIP,
 	updateTicker chan<- struct{}) *State {
 	return &State{
@@ -26,13 +20,18 @@ func New(statusApplier loopstate.Applier,
 }
 
 type State struct {
-	statusApplier loopstate.Applier
+	statusApplier StatusApplier
 
 	settings   settings.PublicIP
 	settingsMu sync.RWMutex
 
-	ipData   models.IPInfoData
+	ipData   publicipmodels.IPInfoData
 	ipDataMu sync.RWMutex
 
 	updateTicker chan<- struct{}
 }
+
+type StatusApplier interface {
+	ApplyStatus(ctx context.Context, status models.LoopStatus) (
+		outcome string, err error)
+}