Small fixes

lavanet · Sep 10, 2024 · c57f655 · c57f655
1 parent 23b8586
commit c57f655
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/protocol/provideroptimizer/provider_optimizer.go b/protocol/provideroptimizer/provider_optimizer.go
@@ -51,8 +51,6 @@ type ProviderOptimizer struct {
 	wantedNumProvidersInConcurrency uint
 	latestSyncData                  ConcurrentBlockStore
 	consumerOptimizerDataCollector  *metrics.ConsumerOptimizerDataCollector
-	chainId                         string
-	apiInterface                    string
 }
 
 type ProviderData struct {
@@ -188,14 +186,14 @@ func (po *ProviderOptimizer) ChooseProvider(allAddresses []string, ignoredProvid
 			returnedProviders[0] = providerAddress // best provider is always on position 0
 			latencyScore = latencyScoreCurrent
 			syncScore = syncScoreCurrent
-			po.consumerOptimizerDataCollector.SetProviderData(providerAddress, epoch, true, providerData.Availability.Num/providerData.Availability.Denom, syncScoreCurrent, latencyScoreCurrent)
+			po.consumerOptimizerDataCollector.SetProviderData(providerAddress, epoch, true, providerData.Availability.Num/providerData.Availability.Denom, providerData.Sync.Num/providerData.Sync.Denom, providerData.Latency.Num/providerData.Latency.Denom)
 			continue
 		}
 		if po.shouldExplore(len(returnedProviders), numProviders) {
 			returnedProviders = append(returnedProviders, providerAddress)
-			po.consumerOptimizerDataCollector.SetProviderData(providerAddress, epoch, true, providerData.Availability.Num/providerData.Availability.Denom, syncScoreCurrent, latencyScoreCurrent)
+			po.consumerOptimizerDataCollector.SetProviderData(providerAddress, epoch, true, providerData.Availability.Num/providerData.Availability.Denom, providerData.Sync.Num/providerData.Sync.Denom, providerData.Latency.Num/providerData.Latency.Denom)
 		} else {
-			po.consumerOptimizerDataCollector.SetProviderData(providerAddress, epoch, false, providerData.Availability.Num/providerData.Availability.Denom, syncScoreCurrent, latencyScoreCurrent)
+			po.consumerOptimizerDataCollector.SetProviderData(providerAddress, epoch, false, providerData.Availability.Num/providerData.Availability.Denom, providerData.Sync.Num/providerData.Sync.Denom, providerData.Latency.Num/providerData.Latency.Denom)
 		}
 	}
 
@@ -373,9 +371,9 @@ func (po *ProviderOptimizer) getProviderData(providerAddress string) (providerDa
 		}
 	} else {
 		providerData = ProviderData{
-			Availability: score.NewScoreStore(0.99, 1, time.Now().Add(-1*INITIAL_DATA_STALENESS*time.Hour)), // default value of 99%
+			Availability: score.NewScoreStore(99, 100, time.Now().Add(-1*INITIAL_DATA_STALENESS*time.Hour)), // default value of 99%
 			Latency:      score.NewScoreStore(1, 1, time.Now().Add(-1*INITIAL_DATA_STALENESS*time.Hour)),    // default value of 1 score (encourage exploration)
-			Sync:         score.NewScoreStore(1, 1, time.Now().Add(-1*INITIAL_DATA_STALENESS*time.Hour)),    // default value of half score (encourage exploration)
+			Sync:         score.NewScoreStore(1, 1, time.Now().Add(-1*INITIAL_DATA_STALENESS*time.Hour)),    // default value of 1 score (encourage exploration)
 			SyncBlock:    0,
 		}
 	}

diff --git a/protocol/rpcconsumer/rpcconsumer.go b/protocol/rpcconsumer/rpcconsumer.go
@@ -54,7 +54,7 @@ var (
 	RelayHealthIntervalFlagDefault                 = 5 * time.Minute
 	CollectOptimizerProviderDataFlag               = false
 	CollectOptimizerProviderDataFlagName           = "collect-optimizer-provider-data"
-	OptimizerProviderDataCollectionIntervalFlag    = 1 * time.Second
+	OptimizerProviderDataCollectionIntervalFlag    = 5 * time.Second
 	OptimizerProviderDataCollectionIntervalFlagNam = "optimizer-provider-data-collection-interval"
 )