Merge pull request #10713 from filecoin-project/steb/fix-event-subscr…

…iption fix: events: don't set GC confidence to 1
filecoin-project · Apr 26, 2023 · eb0b1c9 · eb0b1c9
2 parents 88ff21a + c84c07e
commit eb0b1c9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/chain/events/events.go b/chain/events/events.go
@@ -47,7 +47,7 @@ type Events struct {
 	*hcEvents
 }
 
-func NewEventsWithConfidence(ctx context.Context, api EventAPI, gcConfidence abi.ChainEpoch) (*Events, error) {
+func newEventsWithGCConfidence(ctx context.Context, api EventAPI, gcConfidence abi.ChainEpoch) (*Events, error) {
 	cache := newCache(api, gcConfidence)
 
 	ob := newObserver(cache, gcConfidence)
@@ -63,5 +63,5 @@ func NewEventsWithConfidence(ctx context.Context, api EventAPI, gcConfidence abi
 
 func NewEvents(ctx context.Context, api EventAPI) (*Events, error) {
 	gcConfidence := 2 * build.ForkLengthThreshold
-	return NewEventsWithConfidence(ctx, api, gcConfidence)
+	return newEventsWithGCConfidence(ctx, api, gcConfidence)
 }
diff --git a/node/modules/actorevent.go b/node/modules/actorevent.go
@@ -130,7 +130,7 @@ func EthEventAPI(cfg config.FevmConfig) func(helpers.MetricsCtx, repo.LockedRepo
 
 		lc.Append(fx.Hook{
 			OnStart: func(context.Context) error {
-				ev, err := events.NewEventsWithConfidence(ctx, &evapi, ChainHeadConfidence)
+				ev, err := events.NewEvents(ctx, &evapi)
 				if err != nil {
 					return err
 				}

diff --git a/node/modules/ethmodule.go b/node/modules/ethmodule.go
@@ -54,12 +54,10 @@ func EthModuleAPI(cfg config.FevmConfig) func(helpers.MetricsCtx, repo.LockedRep
 			}
 		}
 
-		const ChainHeadConfidence = 1
-
 		ctx := helpers.LifecycleCtx(mctx, lc)
 		lc.Append(fx.Hook{
 			OnStart: func(context.Context) error {
-				ev, err := events.NewEventsWithConfidence(ctx, &evapi, ChainHeadConfidence)
+				ev, err := events.NewEvents(ctx, &evapi)
 				if err != nil {
 					return err
 				}