From 8daf9212161e29bff9ac2fd63b3db455e5abc719 Mon Sep 17 00:00:00 2001 From: Jian Xiao Date: Thu, 18 Apr 2024 23:16:31 +0000 Subject: [PATCH] fix --- disperser/dataapi/ejector.go | 11 +++++------ disperser/dataapi/server.go | 5 +++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/disperser/dataapi/ejector.go b/disperser/dataapi/ejector.go index 6dee349da1..340d163507 100644 --- a/disperser/dataapi/ejector.go +++ b/disperser/dataapi/ejector.go @@ -36,7 +36,7 @@ func computePerfScore(metric *OperatorNonsigningPercentageMetrics) float64 { return operatorPerfScore(metric.StakePercentage, metric.Percentage/100.0) } -type Ejector struct { +type ejector struct { logger logging.Logger transactor core.Transactor metrics *Metrics @@ -45,15 +45,15 @@ type Ejector struct { mu sync.Mutex } -func NewEjector(logger logging.Logger, tx core.Transactor, metrics *Metrics) *Ejector { - return &Ejector{ +func newEjector(logger logging.Logger, tx core.Transactor, metrics *Metrics) *ejector { + return &ejector{ logger: logger.With("component", "Ejector"), transactor: tx, metrics: metrics, } } -func (e *Ejector) eject(ctx context.Context, nonsigningRate *OperatorsNonsigningPercentage, mode string) error { +func (e *ejector) eject(ctx context.Context, nonsigningRate *OperatorsNonsigningPercentage, mode string) error { e.mu.Lock() defer e.mu.Unlock() @@ -95,7 +95,7 @@ func (e *Ejector) eject(ctx context.Context, nonsigningRate *OperatorsNonsigning return nil } -func (e *Ejector) convertOperators(nonsigners []*OperatorNonsigningPercentageMetrics) ([][]core.OperatorID, error) { +func (e *ejector) convertOperators(nonsigners []*OperatorNonsigningPercentageMetrics) ([][]core.OperatorID, error) { var maxQuorumId uint8 for _, metric := range nonsigners { if metric.QuorumId > maxQuorumId { @@ -116,7 +116,6 @@ func (e *Ejector) convertOperators(nonsigners []*OperatorNonsigningPercentageMet numOperatorByQuorum[metric.QuorumId]++ stakeShareByQuorum[metric.QuorumId] += metric.StakePercentage } - e.metrics.UpdateRequestedOperatorMetric(numOperatorByQuorum, stakeShareByQuorum) return result, nil diff --git a/disperser/dataapi/server.go b/disperser/dataapi/server.go index 79dba1fc0b..140b2ed80b 100644 --- a/disperser/dataapi/server.go +++ b/disperser/dataapi/server.go @@ -148,7 +148,7 @@ type ( subgraphClient SubgraphClient transactor core.Transactor chainState core.ChainState - ejector *Ejector + ejector *ejector metrics *Metrics disperserHostName string @@ -187,7 +187,7 @@ func NewServer( eigenDAHttpServiceChecker = &HttpServiceAvailability{} } - ejector := NewEjector(logger, transactor, metrics) + ejector := newEjector(logger, transactor, metrics) return &server{ logger: logger.With("component", "DataAPIServer"), @@ -335,6 +335,7 @@ func (s *server) EjectOperatorsHandler(c *gin.Context) { interval = 86400 } + // TODO: only need the live nonsigners nonSigningRate, err := s.getOperatorNonsigningRate(c.Request.Context(), endTime.Unix()-interval, endTime.Unix()) if err == nil { err = s.ejector.eject(c.Request.Context(), nonSigningRate, mode)