e2e setup lifecycle

indexer/cmd/indexer/cli.go

@@ -36,6 +36,7 @@ func runIndexer(ctx *cli.Context) error {
 		log.Error("failed to connect to database", "err", err)
 		return err
 	}
+	defer db.Close()
 
 	indexer, err := indexer.NewIndexer(log, db, cfg.Chain, cfg.RPCs, cfg.Metrics)
 	if err != nil {
@@ -59,6 +60,7 @@ func runApi(ctx *cli.Context) error {
 		log.Error("failed to connect to database", "err", err)
 		return err
 	}
+	defer db.Close()
 
 	api := api.NewApi(log, db.BridgeTransfers)
 	return api.Listen(ctx.Context, cfg.API.Port)

indexer/e2e_tests/setup.go

@@ -52,6 +52,7 @@ func createE2ETestSuite(t *testing.T) E2ETestSuite {
 	opCfg.DeployConfig.FinalizationPeriodSeconds = 2
 	opSys, err := opCfg.Start(t)
 	require.NoError(t, err)
+	t.Cleanup(func() { opSys.Close() })
 
 	// E2E tests can run on the order of magnitude of minutes. Once
 	// the system is running, mark this test for Parallel execution
@@ -87,26 +88,18 @@ func createE2ETestSuite(t *testing.T) E2ETestSuite {
 
 	db, err := database.NewDB(indexerCfg.DB)
 	require.NoError(t, err)
+	t.Cleanup(func() { db.Close() })
+
 	indexer, err := indexer.NewIndexer(logger, db, indexerCfg.Chain, indexerCfg.RPCs, indexerCfg.Metrics)
 	require.NoError(t, err)
 
-	indexerStoppedCh := make(chan interface{}, 1)
 	indexerCtx, indexerStop := context.WithCancel(context.Background())
+	t.Cleanup(func() { indexerStop() })
 	go func() {
 		err := indexer.Run(indexerCtx)
 		require.NoError(t, err)
-		indexerStoppedCh <- nil
 	}()
 
-	t.Cleanup(func() {
-		indexerStop()
-		<-indexerStoppedCh
-
-		indexer.Cleanup()
-		db.Close()
-		opSys.Close()
-	})
-
 	return E2ETestSuite{
 		t:        t,
 		DB:       db,

indexer/indexer.go

@@ -132,8 +132,3 @@ func (i *Indexer) Run(ctx context.Context) error {
 
 	return err
 }
-
-// Cleanup releases any resources that might be currently held by the indexer
-func (i *Indexer) Cleanup() {
-	i.db.Close()
-}