feat: unexport server functions used only in server pkg

okp4 · May 10, 2022 · f0c0a0e · f0c0a0e
1 parent 80ae76d
commit f0c0a0e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/cmd/start.go b/cmd/start.go
@@ -1,12 +1,7 @@
 package cmd
 
 import (
-<<<<<<< HEAD
-	"net/http"
-
-=======
 	"github.com/rs/zerolog/log"
->>>>>>> ce45dce (feat: move server related code to server package)
 	"okp4/cosmos-faucet/pkg/client"
 	"okp4/cosmos-faucet/pkg/server"
 

diff --git a/pkg/server/health.go b/pkg/server/health.go
@@ -2,8 +2,7 @@ package server
 
 import "net/http"
 
-// NewHealthRequestHandlerFunc returns a REST handler func to check app status
-func NewHealthRequestHandlerFunc() http.HandlerFunc {
+func newHealthRequestHandlerFunc() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)
 		_, _ = w.Write([]byte(""))

diff --git a/pkg/server/prometheus.go b/pkg/server/prometheus.go
@@ -39,7 +39,7 @@ var totalRequests = prometheus.NewCounterVec(
 
 var responseStatus = prometheus.NewCounterVec(
 	prometheus.CounterOpts{
-		Name: "response_status",
+		Name: "response_status_total",
 		Help: "Status of HTTP response",
 	},
 	[]string{"status"},
@@ -73,7 +73,6 @@ func prometheusMiddleware(handler http.Handler) http.Handler {
 	})
 }
 
-// NewMetricsRequestHandler returns a REST handler returning useful prometheus metrics
-func NewMetricsRequestHandler() http.Handler {
+func newMetricsRequestHandler() http.Handler {
 	return promhttp.Handler()
 }
diff --git a/pkg/server/router.go b/pkg/server/router.go
@@ -10,12 +10,12 @@ func (s *httpServer) createRoutes(faucet *client.Faucet) {
 	s.router.Use(prometheusMiddleware)
 	s.router.Path("/").
 		Queries("address", "{address}").
-		HandlerFunc(NewSendRequestHandlerFn(context.Background(), faucet)).
+		HandlerFunc(newSendRequestHandlerFn(context.Background(), faucet)).
 		Methods("GET")
 	s.router.Path("/health").
-		HandlerFunc(NewHealthRequestHandlerFunc()).
+		HandlerFunc(newHealthRequestHandlerFunc()).
 		Methods("GET")
 	s.router.Path("/metrics").
-		Handler(NewMetricsRequestHandler()).
+		Handler(newMetricsRequestHandler()).
 		Methods("GET")
 }
diff --git a/pkg/server/send.go b/pkg/server/send.go
@@ -1,6 +1,7 @@
 package server
 
 import (
+	"context"
 	"net/http"
 
 	"okp4/cosmos-faucet/pkg/client"
@@ -10,8 +11,7 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-// NewSendRequestHandlerFn returns an HTTP REST handler for make transaction to a given address.
-func NewSendRequestHandlerFn(faucet *client.Faucet) http.HandlerFunc {
+func newSendRequestHandlerFn(ctx context.Context, faucet *client.Faucet) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		vars := mux.Vars(r)
 		bech32Addr := vars["address"]