Merge branch 'fixes' into 'main'

Fixes See merge request flarenetwork/flare-system-client!53
flare-foundation · Dec 9, 2024 · 90498b9 · 90498b9
2 parents 7550d51 + 2eea083
commit 90498b9
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 32 deletions.
diff --git a/client/context/context.go b/client/context/context.go
@@ -34,7 +34,6 @@ func BuildContext() (ClientContext, error) {
 	if err != nil {
 		return nil, err
 	}
-	globalConfig.GlobalConfigCallback.Call(cfg)
 
 	db, err := database.Connect(&cfg.DB)
 	if err != nil {

diff --git a/client/main/client.go b/client/main/client.go
@@ -23,6 +23,8 @@ func main() {
 		return
 	}
 
+	logger.Set(clientCtx.Config().Logger)
+
 	// Prometheus metrics
 	shared.InitMetricsServer(&clientCtx.Config().Metrics)
 

diff --git a/client/protocol/submitter.go b/client/protocol/submitter.go
@@ -366,7 +366,7 @@ func (s *SignatureSubmitter) RunEpochBeforeDeadline(currentEpoch int64, deadline
 }
 
 func (s *SignatureSubmitter) RunEpochAfterDeadline(currentEpoch int64, protocolsToQuery map[int]bool) {
-	channels := make([]<-chan shared.ExecuteStatus[*SubProtocolResponse], len(protocolsToQuery))
+	channels := make([]<-chan shared.ExecuteStatus[*SubProtocolResponse], len(s.subProtocols))
 
 	ticker := time.NewTicker(s.cycleDuration)
 

diff --git a/config/callback.go b/config/callback.go
diff --git a/config/config.go b/config/config.go
@@ -13,23 +13,13 @@ import (
 	"github.com/BurntSushi/toml"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/flare-foundation/go-flare-common/pkg/logger"
 	"github.com/kelseyhightower/envconfig"
 )
 
 const (
 	ConfigFile string = "config.toml" // name of config file
 )
 
-var (
-	GlobalConfigCallback ConfigCallback[Global] = ConfigCallback[Global]{}
-)
-
-type Global interface {
-	LoggerConfig() logger.Config
-	ChainConfig() Chain
-}
-
 type Chain struct {
 	ChainID   int    `toml:"chain_id" envconfig:"CHAIN_ID"`
 	EthRPCURL string `toml:"eth_rpc_url" envconfig:"ETH_RPC_URL"`

diff --git a/tests/mock/server_mock.go b/tests/mock/server_mock.go
@@ -12,10 +12,6 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/flare-foundation/flare-system-client/client/config"
-
-	globalConfig "github.com/flare-foundation/flare-system-client/config"
-
 	"github.com/gorilla/mux"
 
 	"github.com/flare-foundation/go-flare-common/pkg/logger"
@@ -114,7 +110,7 @@ func buildMessageForSigning(protocolID uint8, roundID uint32, merkleRoot []byte)
 }
 
 func main() {
-	globalConfig.GlobalConfigCallback.Call(config.Client{Logger: logger.Config{Console: true}})
+	logger.Set(logger.Config{Console: true})
 
 	port := 3100
 	protocolID := uint8(101)
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,8 @@ func main() { @@
     		return
     	}
+    	logger.Set(clientCtx.Config().Logger)
     	// Prometheus metrics
     	shared.InitMetricsServer(&clientCtx.Config().Metrics)
@@ Expand Down @@