remove HTTPRegistrar interface in preference of Registrar

rpcs/blockService.go

@@ -152,14 +152,8 @@ func MakeBlockService(log logging.Logger, config config.Local, ledger LedgerForB
 	return service
 }
 
-// HTTPRegistrar represents an HTTP request router that can be used by BlockService
-// to register its request handlers.
-type HTTPRegistrar interface {
-	RegisterHTTPHandlerFunc(path string, handler func(response http.ResponseWriter, request *http.Request))
-}
-
 // RegisterHandlers registers the request handlers for BlockService's paths with the registrar.
-func (bs *BlockService) RegisterHandlers(registrar HTTPRegistrar) {
+func (bs *BlockService) RegisterHandlers(registrar Registrar) {
 	registrar.RegisterHTTPHandlerFunc(BlockServiceBlockPath, bs.ServeBlockPath)
 }
 

rpcs/registrar.go

@@ -26,6 +26,8 @@ import (
 type Registrar interface {
 	// RegisterHTTPHandler path accepts gorilla/mux path annotations
 	RegisterHTTPHandler(path string, handler http.Handler)
+	// RegisterHTTPHandlerFunc path accepts gorilla/mux path annotations and a HandlerFunc
+	RegisterHTTPHandlerFunc(path string, handler func(response http.ResponseWriter, request *http.Request))
 	// RegisterHandlers exposes global websocket handler registration
 	RegisterHandlers(dispatch []network.TaggedMessageHandler)
 }