chore: moved controller to a separate module

QuokkaStake · Jan 7, 2025 · 64be568 · 64be568
1 parent d3cbda7
commit 64be568
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/pkg/app.go b/pkg/app.go
@@ -2,6 +2,7 @@ package pkg
 
 import (
 	"context"
+	controllerPkg "main/pkg/controller"
 	fetchersPkg "main/pkg/fetchers"
 	"main/pkg/fs"
 	generatorsPkg "main/pkg/generators"
@@ -42,7 +43,7 @@ type App struct {
 	// based on ValidatorsFetcher and StakingParamsFetcher.
 	Generators []generatorsPkg.Generator
 
-	Controller *fetchersPkg.Controller
+	Controller *controllerPkg.Controller
 }
 
 func NewApp(configPath string, filesystem fs.FS, version string) *App {
@@ -121,7 +122,7 @@ func NewApp(configPath string, filesystem fs.FS, version string) *App {
 		generatorsPkg.NewSupplyGenerator(appConfig.Chains),
 	}
 
-	controller := fetchersPkg.NewController(fetchers, logger)
+	controller := controllerPkg.NewController(fetchers, logger)
 
 	server := &http.Server{Addr: appConfig.ListenAddress, Handler: nil}
 

diff --git a/pkg/fetchers/controller.go → pkg/controller/controller.go b/pkg/fetchers/controller.go → pkg/controller/controller.go
@@ -1,8 +1,9 @@
-package fetchers
+package controller
 
 import (
 	"context"
 	"main/pkg/constants"
+	fetchersPkg "main/pkg/fetchers"
 	statePkg "main/pkg/state"
 	"main/pkg/types"
 	"sync"
@@ -23,12 +24,12 @@ func (s FetchersStatuses) IsAllDone(fetcherNames []constants.FetcherName) bool {
 }
 
 type Controller struct {
-	Fetchers Fetchers
+	Fetchers fetchersPkg.Fetchers
 	Logger   zerolog.Logger
 }
 
 func NewController(
-	fetchers Fetchers,
+	fetchers fetchersPkg.Fetchers,
 	logger *zerolog.Logger,
 ) *Controller {
 	return &Controller{
@@ -50,7 +51,7 @@ func (c *Controller) Fetch(ctx context.Context) (
 	var mutex sync.Mutex
 	var wg sync.WaitGroup
 
-	processFetcher := func(fetcher Fetcher) {
+	processFetcher := func(fetcher fetchersPkg.Fetcher) {
 		defer wg.Done()
 
 		c.Logger.Trace().Str("name", string(fetcher.Name())).Msg("Processing fetcher...")
@@ -80,7 +81,7 @@ func (c *Controller) Fetch(ctx context.Context) (
 			break
 		}
 
-		fetchersToStart := Fetchers{}
+		fetchersToStart := fetchersPkg.Fetchers{}
 
 		for _, fetcher := range c.Fetchers {
 			if _, ok := fetchersStatus[fetcher.Name()]; ok {

diff --git a/pkg/fetchers/controller_test.go → pkg/controller/controller_test.go b/pkg/fetchers/controller_test.go → pkg/controller/controller_test.go
@@ -1,9 +1,10 @@
-package fetchers
+package controller
 
 import (
 	"context"
 	"main/assets"
 	configPkg "main/pkg/config"
+	fetchersPkg "main/pkg/fetchers"
 	loggerPkg "main/pkg/logger"
 	"main/pkg/tendermint"
 	"main/pkg/tracing"
@@ -44,20 +45,20 @@ func TestControllerFetcherEnabled(t *testing.T) {
 			tracing.InitNoopTracer(),
 		),
 	}
-	fetcher1 := NewNodeInfoFetcher(
+	fetcher1 := fetchersPkg.NewNodeInfoFetcher(
 		loggerPkg.GetNopLogger(),
 		chains,
 		rpcs,
 		tracing.InitNoopTracer(),
 	)
-	fetcher2 := NewRewardsFetcher(
+	fetcher2 := fetchersPkg.NewRewardsFetcher(
 		loggerPkg.GetNopLogger(),
 		chains,
 		rpcs,
 		tracing.InitNoopTracer(),
 	)
 	logger := loggerPkg.GetNopLogger()
-	controller := NewController(Fetchers{fetcher1, fetcher2}, logger)
+	controller := NewController(fetchersPkg.Fetchers{fetcher1, fetcher2}, logger)
 
 	data, queryInfos := controller.Fetch(context.Background())
 	assert.Len(t, queryInfos, 2)