Use api.Route instead of the caHandler.

api/api.go

@@ -249,18 +249,21 @@ type FederationResponse struct {
 }
 
 // caHandler is the type used to implement the different CA HTTP endpoints.
-type caHandler struct {
+type caHandler struct{}
-	Authority Authority
+
+// Route configures the http request router.
+func (h *caHandler) Route(r Router) {
+	Route(r)
 }
 
 // New creates a new RouterHandler with the CA endpoints.
+//
+// Deprecated: Use api.Route(r Router)
 func New(auth Authority) RouterHandler {
-	return &caHandler{
+	return &caHandler{}
-		Authority: auth,
-	}
 }
 
-func (h *caHandler) Route(r Router) {
+func Route(r Router) {
 	r.MethodFunc("GET", "/version", Version)
 	r.MethodFunc("GET", "/health", Health)
 	r.MethodFunc("GET", "/root/{sha}", Root)

ca/ca.go

@@ -170,10 +170,9 @@ func (ca *CA) Init(cfg *config.Config) (*CA, error) {
 	insecureHandler := http.Handler(insecureMux)
 
 	// Add regular CA api endpoints in / and /1.0
-	routerHandler := api.New(auth)
+	api.Route(mux)
-	routerHandler.Route(mux)
 	mux.Route("/1.0", func(r chi.Router) {
-		routerHandler.Route(r)
+		api.Route(r)
 	})
 
 	//Add ACME api endpoints in /acme and /1.0/acme