Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
jianoaix committed Apr 18, 2024
1 parent 4cef860 commit 8daf921
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
11 changes: 5 additions & 6 deletions disperser/dataapi/ejector.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()

Expand Down Expand Up @@ -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 {
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions disperser/dataapi/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ type (
subgraphClient SubgraphClient
transactor core.Transactor
chainState core.ChainState
ejector *Ejector
ejector *ejector

metrics *Metrics
disperserHostName string
Expand Down Expand Up @@ -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"),
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 8daf921

Please sign in to comment.