Remove duplicate EventFilterManager and ActorEventHandler functions

During the resolution of merge conflicts, duplicate definitions of the EventFilterManager and ActorEventHandler functions were inadvertently introduced into actorevent.go.
filecoin-project · Mar 25, 2024 · aa7e0c2 · aa7e0c2
1 parent 6dbcd75
commit aa7e0c2
Showing 1 changed file with 0 additions and 92 deletions.
diff --git a/node/modules/actorevent.go b/node/modules/actorevent.go
@@ -94,98 +94,6 @@ func EthEventHandler(cfg config.EventsConfig, enableEthRPC bool) func(helpers.Me
 	}
 }
 
-func EventFilterManager(cfg config.FevmConfig) func(helpers.MetricsCtx, repo.LockedRepo, fx.Lifecycle, *store.ChainStore, *stmgr.StateManager, EventHelperAPI, full.ChainAPI) (*filter.EventFilterManager, error) {
-	return func(mctx helpers.MetricsCtx, r repo.LockedRepo, lc fx.Lifecycle, cs *store.ChainStore, sm *stmgr.StateManager, evapi EventHelperAPI, chainapi full.ChainAPI) (*filter.EventFilterManager, error) {
-		ctx := helpers.LifecycleCtx(mctx, lc)
-
-		// Enable indexing of actor events
-		var eventIndex *filter.EventIndex
-		if !cfg.Events.DisableHistoricFilterAPI {
-			var dbPath string
-			if cfg.Events.DatabasePath == "" {
-				sqlitePath, err := r.SqlitePath()
-				if err != nil {
-					return nil, err
-				}
-				dbPath = filepath.Join(sqlitePath, "events.db")
-			} else {
-				dbPath = cfg.Events.DatabasePath
-			}
-
-			var err error
-			eventIndex, err = filter.NewEventIndex(ctx, dbPath, chainapi.Chain)
-			if err != nil {
-				return nil, err
-			}
-
-			lc.Append(fx.Hook{
-				OnStop: func(context.Context) error {
-					return eventIndex.Close()
-				},
-			})
-		}
-
-		fm := &filter.EventFilterManager{
-			ChainStore: cs,
-			EventIndex: eventIndex, // will be nil unless EnableHistoricFilterAPI is true
-			// TODO:
-			// We don't need this address resolution anymore once https://github.com/filecoin-project/lotus/issues/11594 lands
-			AddressResolver: func(ctx context.Context, emitter abi.ActorID, ts *types.TipSet) (address.Address, bool) {
-				idAddr, err := address.NewIDAddress(uint64(emitter))
-				if err != nil {
-					return address.Undef, false
-				}
-
-				actor, err := sm.LoadActor(ctx, idAddr, ts)
-				if err != nil || actor.Address == nil {
-					return idAddr, true
-				}
-
-				return *actor.Address, true
-			},
-
-			MaxFilterResults: cfg.Events.MaxFilterResults,
-		}
-
-		lc.Append(fx.Hook{
-			OnStart: func(context.Context) error {
-				ev, err := events.NewEvents(ctx, &evapi)
-				if err != nil {
-					return err
-				}
-				// ignore returned tipsets
-				_ = ev.Observe(ee.TipSetFilterManager)
-
-				ch, err := mp.Updates(ctx)
-				if err != nil {
-					return err
-				}
-				go ee.MemPoolFilterManager.WaitForMpoolUpdates(ctx, ch)
-
-				return nil
-			},
-		})
-
-		return fm, nil
-	}
-}
-
-func ActorEventHandler(enable bool, fevmCfg config.FevmConfig) func(helpers.MetricsCtx, repo.LockedRepo, fx.Lifecycle, *filter.EventFilterManager, *store.ChainStore, *stmgr.StateManager, EventHelperAPI, *messagepool.MessagePool, full.StateAPI, full.ChainAPI) (*full.ActorEventHandler, error) {
-	return func(mctx helpers.MetricsCtx, r repo.LockedRepo, lc fx.Lifecycle, fm *filter.EventFilterManager, cs *store.ChainStore, sm *stmgr.StateManager, evapi EventHelperAPI, mp *messagepool.MessagePool, stateapi full.StateAPI, chainapi full.ChainAPI) (*full.ActorEventHandler, error) {
-
-		if !enable || fevmCfg.Events.DisableRealTimeFilterAPI {
-			fm = nil
-		}
-
-		return full.NewActorEventHandler(
-			cs,
-			fm,
-			time.Duration(build.BlockDelaySecs)*time.Second,
-			abi.ChainEpoch(fevmCfg.Events.MaxFilterHeightRange),
-		), nil
-	}
-}
-
 func EventFilterManager(cfg config.EventsConfig) func(helpers.MetricsCtx, repo.LockedRepo, fx.Lifecycle, *store.ChainStore, *stmgr.StateManager, EventHelperAPI, full.ChainAPI) (*filter.EventFilterManager, error) {
 	return func(mctx helpers.MetricsCtx, r repo.LockedRepo, lc fx.Lifecycle, cs *store.ChainStore, sm *stmgr.StateManager, evapi EventHelperAPI, chainapi full.ChainAPI) (*filter.EventFilterManager, error) {
 		ctx := helpers.LifecycleCtx(mctx, lc)