fixes after review

multiversx · Oct 1, 2024 · 2e35868 · 2e35868
1 parent 1763fd1
commit 2e35868
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/cmd/proxy/main.go b/cmd/proxy/main.go
@@ -408,27 +408,7 @@ func createVersionsRegistry(
 		return nil, err
 	}
 
-	httpClient := &http.Client{}
-	httpClient.Timeout = time.Duration(cfg.GeneralSettings.RequestTimeoutSec) * time.Second
-	observersList := make([]string, 0, len(cfg.Observers))
-	for _, node := range cfg.Observers {
-		observersList = append(observersList, node.Address)
-	}
-	argsNumShardsProcessor := process.ArgNumShardsProcessor{
-		HttpClient:                    httpClient,
-		Observers:                     observersList,
-		TimeBetweenNodesRequestsInSec: cfg.GeneralSettings.TimeBetweenNodesRequestsInSec,
-		NumShardsTimeoutInSec:         cfg.GeneralSettings.NumShardsTimeoutInSec,
-		RequestTimeoutInSec:           cfg.GeneralSettings.RequestTimeoutSec,
-	}
-	numShardsProcessor, err := process.NewNumShardsProcessor(argsNumShardsProcessor)
-	if err != nil {
-		return nil, err
-	}
-
-	ctx, cancel := context.WithCancel(context.Background())
-	numShards, err := numShardsProcessor.GetNetworkNumShards(ctx)
-	cancel()
+	numShards, err := getNumOfShards(cfg)
 	if err != nil {
 		return nil, err
 	}
@@ -636,6 +616,32 @@ func waitForServerShutdown(httpServer *http.Server, closableComponents *data.Clo
 	_ = httpServer.Close()
 }
 
+// getNumOfShards will delay the start of proxy until it successfully gets the number of shards
+func getNumOfShards(cfg *config.Config) (uint32, error) {
+	httpClient := &http.Client{}
+	httpClient.Timeout = time.Duration(cfg.GeneralSettings.RequestTimeoutSec) * time.Second
+	observersList := make([]string, 0, len(cfg.Observers))
+	for _, node := range cfg.Observers {
+		observersList = append(observersList, node.Address)
+	}
+	argsNumShardsProcessor := process.ArgNumShardsProcessor{
+		HttpClient:                    httpClient,
+		Observers:                     observersList,
+		TimeBetweenNodesRequestsInSec: cfg.GeneralSettings.TimeBetweenNodesRequestsInSec,
+		NumShardsTimeoutInSec:         cfg.GeneralSettings.NumShardsTimeoutInSec,
+		RequestTimeoutInSec:           cfg.GeneralSettings.RequestTimeoutSec,
+	}
+	numShardsProcessor, err := process.NewNumShardsProcessor(argsNumShardsProcessor)
+	if err != nil {
+		return 0, err
+	}
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	return numShardsProcessor.GetNetworkNumShards(ctx)
+}
+
 func removeLogColors() {
 	err := logger.RemoveLogObserver(os.Stdout)
 	if err != nil {

diff --git a/process/numShardsProcessor.go b/process/numShardsProcessor.go
@@ -15,10 +15,6 @@ import (
 
 var errTimeIsOut = errors.New("time is out")
 
-const (
-	networkConfigPath = "/network/config"
-)
-
 type networkConfigResponseData struct {
 	Config struct {
 		NumShards uint32 `json:"erd_num_shards_without_meta"`
@@ -112,7 +108,7 @@ func (processor *numShardsProcessor) tryGetnumShardsFromObserver(observerAddress
 	ctx, cancel := context.WithTimeout(context.Background(), processor.requestTimeout)
 	defer cancel()
 
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, observerAddress+networkConfigPath, nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, observerAddress+NetworkConfigPath, nil)
 	if err != nil {
 		return 0, http.StatusNotFound
 	}