Commit f43c24a8 authored by Ethen Pociask's avatar Ethen Pociask

[indexer.client] Routes: public --> private fields

parent 6a1f9ca2
...@@ -63,20 +63,20 @@ func (h Routes) L1DepositsHandler(w http.ResponseWriter, r *http.Request) { ...@@ -63,20 +63,20 @@ func (h Routes) L1DepositsHandler(w http.ResponseWriter, r *http.Request) {
limit, err := h.v.ValidateLimit(limitQuery) limit, err := h.v.ValidateLimit(limitQuery)
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest) http.Error(w, err.Error(), http.StatusBadRequest)
h.Logger.Error("Invalid limit param", "param", limitQuery) h.logger.Error("Invalid limit param", "param", limitQuery)
h.Logger.Error(err.Error()) h.logger.Error(err.Error())
return return
} }
deposits, err := h.BridgeTransfersView.L1BridgeDepositsByAddress(address, cursor, limit) deposits, err := h.view.L1BridgeDepositsByAddress(address, cursor, limit)
if err != nil { if err != nil {
http.Error(w, "Internal server error reading deposits", http.StatusInternalServerError) http.Error(w, "Internal server error reading deposits", http.StatusInternalServerError)
h.Logger.Error("Unable to read deposits from DB") h.logger.Error("Unable to read deposits from DB")
h.Logger.Error(err.Error()) h.logger.Error(err.Error())
return return
} }
response := newDepositResponse(deposits) response := newDepositResponse(deposits)
jsonResponse(w, h.Logger, response, http.StatusOK) jsonResponse(w, h.logger, response, http.StatusOK)
} }
...@@ -9,14 +9,14 @@ import ( ...@@ -9,14 +9,14 @@ import (
func (h Routes) DocsHandler(w http.ResponseWriter, r *http.Request) { func (h Routes) DocsHandler(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "text/plain") w.Header().Set("Content-Type", "text/plain")
w.WriteHeader(http.StatusOK) 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", ProjectPath: "github.com/ethereum-optimism/optimism/indexer",
// Intro text included at the top of the generated markdown file. // Intro text included at the top of the generated markdown file.
Intro: "Generated documentation for Optimism indexer", Intro: "Generated documentation for Optimism indexer",
}) })
_, err := w.Write([]byte(docs)) _, err := w.Write([]byte(docs))
if err != nil { 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) http.Error(w, "Internal server error fetching docs", http.StatusInternalServerError)
} }
} }
...@@ -8,17 +8,17 @@ import ( ...@@ -8,17 +8,17 @@ import (
// Routes ... Route handler struct // Routes ... Route handler struct
type Routes struct { type Routes struct {
Logger log.Logger logger log.Logger
BridgeTransfersView database.BridgeTransfersView view database.BridgeTransfersView
Router *chi.Mux router *chi.Mux
v *Validator v *Validator
} }
// NewRoutes ... Construct a new route handler instance // NewRoutes ... Construct a new route handler instance
func NewRoutes(logger log.Logger, bv database.BridgeTransfersView, r *chi.Mux) Routes { func NewRoutes(logger log.Logger, bv database.BridgeTransfersView, r *chi.Mux) Routes {
return Routes{ return Routes{
Logger: logger, logger: logger,
BridgeTransfersView: bv, view: bv,
Router: r, router: r,
} }
} }
...@@ -63,19 +63,19 @@ func (h Routes) L2WithdrawalsHandler(w http.ResponseWriter, r *http.Request) { ...@@ -63,19 +63,19 @@ func (h Routes) L2WithdrawalsHandler(w http.ResponseWriter, r *http.Request) {
limit, err := h.v.ValidateLimit(limitQuery) limit, err := h.v.ValidateLimit(limitQuery)
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest) http.Error(w, err.Error(), http.StatusBadRequest)
h.Logger.Error("Invalid query params") h.logger.Error("Invalid query params")
h.Logger.Error(err.Error()) h.logger.Error(err.Error())
return return
} }
withdrawals, err := h.BridgeTransfersView.L2BridgeWithdrawalsByAddress(address, cursor, limit) withdrawals, err := h.view.L2BridgeWithdrawalsByAddress(address, cursor, limit)
if err != nil { if err != nil {
http.Error(w, "Internal server error reading withdrawals", http.StatusInternalServerError) http.Error(w, "Internal server error reading withdrawals", http.StatusInternalServerError)
h.Logger.Error("Unable to read withdrawals from DB") h.logger.Error("Unable to read withdrawals from DB")
h.Logger.Error(err.Error()) h.logger.Error(err.Error())
return return
} }
response := newWithdrawalResponse(withdrawals) response := newWithdrawalResponse(withdrawals)
jsonResponse(w, h.Logger, response, http.StatusOK) jsonResponse(w, h.logger, response, http.StatusOK)
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment