refactor: minor updates

core/meterer/meterer.go

@@ -15,6 +15,9 @@ type Config struct {
 
 	// ChainReadTimeout is the timeout for reading payment state from chain
 	ChainReadTimeout time.Duration
+
+	// UpdateInterval is the interval for refreshing the on-chain state
+	UpdateInterval time.Duration
 }
 
 // Meterer handles payment accounting across different accounts. Disperser API server receives requests from clients and each request contains a blob header
@@ -47,9 +50,9 @@ func NewMeterer(
 }
 
 // Start starts to periodically refreshing the on-chain state
-func (m *Meterer) Start(ctx context.Context) {
+func (m *Meterer) Start(ctx context.Context, updateInterval time.Duration) {
 	go func() {
-		ticker := time.NewTicker(1 * time.Second)
+		ticker := time.NewTicker(updateInterval)
 		defer ticker.Stop()
 
 		for {

core/meterer/meterer_test.go

@@ -157,7 +157,7 @@ func setup(_ *testing.M) {
 		// metrics.NewNoopMetrics(),
 	)
 
-	mt.Start(context.Background())
+	mt.Start(context.Background(), config.UpdateInterval)
 }
 
 func teardown() {

disperser/apiserver/server.go

@@ -214,7 +214,7 @@ func (s *DispersalServer) DisperseBlobAuthenticated(stream pb.Disperser_Disperse
 	}
 
 	// Disperse the blob
-	reply, err := s.disperseBlob(ctx, blob, authenticatedAddress, "DisperseBlobAuthenticated", &core.PaymentMetadata{})
+	reply, err := s.disperseBlob(ctx, blob, authenticatedAddress, "DisperseBlobAuthenticated", nil)
 	if err != nil {
 		// Note the disperseBlob already updated metrics for this error.
 		s.logger.Info("failed to disperse blob", "err", err)
@@ -284,7 +284,7 @@ func (s *DispersalServer) disperseBlob(ctx context.Context, blob *core.Blob, aut
 	s.logger.Debug("received a new blob dispersal request", "authenticatedAddress", authenticatedAddress, "origin", origin, "blobSizeBytes", blobSize, "securityParams", strings.Join(securityParamsStrings, ", "))
 
 	// If paymentHeader is not empty, we use the meterer, otherwise we use the ratelimiter if the ratelimiter is available
-	if paymentHeader != nil && *paymentHeader != (core.PaymentMetadata{}) {
+	if paymentHeader != nil {
 		err := s.meterer.MeterRequest(ctx, *blob, *paymentHeader)
 		if err != nil {
 			return nil, api.NewErrorResourceExhausted(err.Error())

disperser/cmd/apiserver/config.go

@@ -32,6 +32,8 @@ type Config struct {
 	RateConfig            apiserver.RateConfig
 	EnableRatelimiter     bool
 	EnablePaymentMeterer  bool
+	UpdateInterval        int
+	ChainReadTimeout      int
 	ReservationsTableName string
 	OnDemandTableName     string
 	GlobalRateTableName   string

disperser/cmd/apiserver/main.go

@@ -105,7 +105,8 @@ func RunDisperserServer(ctx *cli.Context) error {
 	var meterer *mt.Meterer
 	if config.EnablePaymentMeterer {
 		mtConfig := mt.Config{
-			ChainReadTimeout: 3 * time.Second,
+			ChainReadTimeout: time.Duration(config.ChainReadTimeout) * time.Second,
+			UpdateInterval:   time.Duration(config.UpdateInterval) * time.Second,
 		}
 
 		paymentChainState, err := mt.NewOnchainPaymentState(context.Background(), transactor)