diff --git a/indexer/api/routes/deposits.go b/indexer/api/routes/deposits.go index 5c0c8ac36baabc80e8a442089fceb59c2eb7f398..4eafbfa033efb93642cff05b3acba1ac610573e4 100644 --- a/indexer/api/routes/deposits.go +++ b/indexer/api/routes/deposits.go @@ -63,20 +63,20 @@ func (h Routes) L1DepositsHandler(w http.ResponseWriter, r *http.Request) { limit, err := h.v.ValidateLimit(limitQuery) if err != nil { http.Error(w, err.Error(), http.StatusBadRequest) - h.Logger.Error("Invalid limit param", "param", limitQuery) - h.Logger.Error(err.Error()) + h.logger.Error("Invalid limit param", "param", limitQuery) + h.logger.Error(err.Error()) return } - deposits, err := h.BridgeTransfersView.L1BridgeDepositsByAddress(address, cursor, limit) + deposits, err := h.view.L1BridgeDepositsByAddress(address, cursor, limit) if err != nil { http.Error(w, "Internal server error reading deposits", http.StatusInternalServerError) - h.Logger.Error("Unable to read deposits from DB") - h.Logger.Error(err.Error()) + h.logger.Error("Unable to read deposits from DB") + h.logger.Error(err.Error()) return } response := newDepositResponse(deposits) - jsonResponse(w, h.Logger, response, http.StatusOK) + jsonResponse(w, h.logger, response, http.StatusOK) } diff --git a/indexer/api/routes/docs.go b/indexer/api/routes/docs.go index 638aa6f90b21c920784fd461ea7a7e6fd069339b..b88a8b10a9150cb7a0cdcf32feab681243b264a2 100644 --- a/indexer/api/routes/docs.go +++ b/indexer/api/routes/docs.go @@ -9,14 +9,14 @@ import ( func (h Routes) DocsHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "text/plain") w.WriteHeader(http.StatusOK) - docs := docgen.MarkdownRoutesDoc(h.Router, docgen.MarkdownOpts{ + docs := docgen.MarkdownRoutesDoc(h.router, docgen.MarkdownOpts{ ProjectPath: "github.com/ethereum-optimism/optimism/indexer", // Intro text included at the top of the generated markdown file. Intro: "Generated documentation for Optimism indexer", }) _, err := w.Write([]byte(docs)) if err != nil { - h.Logger.Error("error writing docs", "err", err) + h.logger.Error("error writing docs", "err", err) http.Error(w, "Internal server error fetching docs", http.StatusInternalServerError) } } diff --git a/indexer/api/routes/routes.go b/indexer/api/routes/routes.go index ac964ddf22fd8a2d86b42555f2de9341fa0e4563..488805b08872fbaabfe5aa87ecc992e2a58c7455 100644 --- a/indexer/api/routes/routes.go +++ b/indexer/api/routes/routes.go @@ -8,17 +8,17 @@ import ( // Routes ... Route handler struct type Routes struct { - Logger log.Logger - BridgeTransfersView database.BridgeTransfersView - Router *chi.Mux - v *Validator + logger log.Logger + view database.BridgeTransfersView + router *chi.Mux + v *Validator } // NewRoutes ... Construct a new route handler instance func NewRoutes(logger log.Logger, bv database.BridgeTransfersView, r *chi.Mux) Routes { return Routes{ - Logger: logger, - BridgeTransfersView: bv, - Router: r, + logger: logger, + view: bv, + router: r, } } diff --git a/indexer/api/routes/withdrawals.go b/indexer/api/routes/withdrawals.go index 4fe005f2f8d0ba622121b2445331e0f42d6b9f6e..3e1dc529b1ad4e3019525fcf5d50bb4339e3d4a2 100644 --- a/indexer/api/routes/withdrawals.go +++ b/indexer/api/routes/withdrawals.go @@ -63,19 +63,19 @@ func (h Routes) L2WithdrawalsHandler(w http.ResponseWriter, r *http.Request) { limit, err := h.v.ValidateLimit(limitQuery) if err != nil { http.Error(w, err.Error(), http.StatusBadRequest) - h.Logger.Error("Invalid query params") - h.Logger.Error(err.Error()) + h.logger.Error("Invalid query params") + h.logger.Error(err.Error()) return } - withdrawals, err := h.BridgeTransfersView.L2BridgeWithdrawalsByAddress(address, cursor, limit) + withdrawals, err := h.view.L2BridgeWithdrawalsByAddress(address, cursor, limit) if err != nil { http.Error(w, "Internal server error reading withdrawals", http.StatusInternalServerError) - h.Logger.Error("Unable to read withdrawals from DB") - h.Logger.Error(err.Error()) + h.logger.Error("Unable to read withdrawals from DB") + h.logger.Error(err.Error()) return } response := newWithdrawalResponse(withdrawals) - jsonResponse(w, h.Logger, response, http.StatusOK) + jsonResponse(w, h.logger, response, http.StatusOK) }