🐛 bad rebase

indexer/api/api.go

@@ -23,8 +23,8 @@ const ethereumAddressRegex = `^0x[a-fA-F0-9]{40}$`
 type Api struct {
 	log             log.Logger
 	Router          *chi.Mux
-	apiConfig       config.APIConfig
-	metricsConfig   config.MetricsConfig
+	serverConfig    config.ServerConfig
+	metricsConfig   config.ServerConfig
 	metricsRegistry *prometheus.Registry
 }
 
@@ -38,20 +38,20 @@ func chiMetricsMiddleware(rec metrics.HTTPRecorder) func(http.Handler) http.Hand
 	}
 }
 
-func NewApi(logger log.Logger, bv database.BridgeTransfersView, apiConfig config.APIConfig, metricsConfig config.MetricsConfig) *Api {
+func NewApi(logger log.Logger, bv database.BridgeTransfersView, serverConfig config.ServerConfig, metricsConfig config.ServerConfig) *Api {
 	apiRouter := chi.NewRouter()
 	h := routes.NewRoutes(logger, bv, apiRouter)
 
 	mr := metrics.NewRegistry()
 	promRecorder := metrics.NewPromHTTPRecorder(mr, MetricsNamespace)
 
-	apiRouter.Use(ChiMetricsMiddleware(promRecorder))
+	apiRouter.Use(chiMetricsMiddleware(promRecorder))
 	apiRouter.Use(middleware.Heartbeat("/healthz"))
 
 	apiRouter.Get(fmt.Sprintf("/api/v0/deposits/{address:%s}", ethereumAddressRegex), h.L1DepositsHandler)
 	apiRouter.Get(fmt.Sprintf("/api/v0/withdrawals/{address:%s}", ethereumAddressRegex), h.L2WithdrawalsHandler)
 
-	return &Api{log: logger, Router: apiRouter, metricsRegistry: mr, metricsConfig: metricsConfig, apiConfig: apiConfig}
+	return &Api{log: logger, Router: apiRouter, metricsRegistry: mr, serverConfig: serverConfig, metricsConfig: metricsConfig}
 }
 
 func (a *Api) Start(ctx context.Context) error {
@@ -93,8 +93,8 @@ func (a *Api) Start(ctx context.Context) error {
 }
 
 func (a *Api) startServer(ctx context.Context) error {
-	a.log.Info("api server listening...", "port", a.apiConfig.Port)
-	server := http.Server{Addr: fmt.Sprintf(":%d", a.apiConfig.Port), Handler: a.Router}
+	a.log.Info("api server listening...", "port", a.serverConfig.Port)
+	server := http.Server{Addr: fmt.Sprintf(":%d", a.serverConfig.Port), Handler: a.Router}
 	err := httputil.ListenAndServeContext(ctx, &server)
 	if err != nil {
 		a.log.Error("api server stopped", "err", err)

indexer/api/api_test.go

@@ -19,11 +19,11 @@ type MockBridgeTransfersView struct{}
 
 var mockAddress = "0x4204204204204204204204204204204204204204"
 
-var apiConfig = config.APIConfig{
+var apiConfig = config.ServerConfig{
 	Host: "localhost",
 	Port: 8080,
 }
-var metricsConfig = config.MetricsConfig{
+var metricsConfig = config.ServerConfig{
 	Host: "localhost",
 	Port: 7300,
 }

indexer/cmd/indexer/cli.go

@@ -62,55 +62,8 @@ func runApi(ctx *cli.Context) error {
 	}
 	defer db.Close()
 
-	api := api.NewApi(log, db.BridgeTransfers)
-	return api.Listen(ctx.Context, cfg.HTTPServer.Port)
-}
-
-func runApiMetrics(ctx *cli.Context) error {
-	log := log.NewLogger(log.ReadCLIConfig(ctx)).New("role", "api")
-	cfg, err := config.LoadConfig(log, ctx.String(ConfigFlag.Name))
-	if err != nil {
-		log.Error("failed to load config", "err", err)
-		return err
-	}
-
-	db, err := database.NewDB(cfg.DB)
-	if err != nil {
-		log.Error("failed to connect to database", "err", err)
-		return err
-	}
-
-	api := api.NewApi(log, db.BridgeTransfers)
-	return api.Listen(ctx.Context, cfg.Metrics.Port)
-}
-
-func runApiAndMetrics(ctx *cli.Context) error {
-	log := log.NewLogger(log.ReadCLIConfig(ctx))
-
-	// Ensure both processes complete before returning.
-	var wg sync.WaitGroup
-	wg.Add(2)
-
-	go func() {
-		defer wg.Done()
-		err := runApi(ctx)
-		if err != nil {
-			log.Error("api process non-zero exit", "err", err)
-		}
-	}()
-	go func() {
-		defer wg.Done()
-		err := runApiMetrics(ctx)
-		if err != nil {
-			log.Error("indexer process non-zero exit", "err", err)
-		}
-	}()
-
-	// We purposefully return no error since the indexer and api
-	// have no inter-dependencies. We simply rely on the logs to
-	// report a non-zero exit for either process.
-	wg.Wait()
-	return nil
+	api := api.NewApi(log, db.BridgeTransfers, cfg.HTTPServer, cfg.MetricsServer)
+	return api.Start(ctx.Context)
 }
 
 func runAll(ctx *cli.Context) error {