move array types to respective packages

function/function.go

@@ -25,6 +25,11 @@ type Function struct {
 	Provider *Provider `json:"provider" validate:"required"`
 }
 
+// Functions is an array of functions.
+type Functions struct {
+	Functions []*Function `json:"functions"`
+}
+
 // ID uniquely identifies a function.
 type ID string
 

httpapi/httpapi.go

@@ -60,14 +60,10 @@ func (h HTTPAPI) getFunctions(w http.ResponseWriter, r *http.Request, params htt
 		w.WriteHeader(http.StatusInternalServerError)
 		encoder.Encode(&Error{Error: err.Error()})
 	} else {
-		encoder.Encode(&functions{fns})
+		encoder.Encode(&function.Functions{Functions: fns})
 	}
 }
 
-type functions struct {
-	Functions []*function.Function `json:"functions"`
-}
-
 func (h HTTPAPI) registerFunction(w http.ResponseWriter, r *http.Request, params httprouter.Params) {
 	w.Header().Set("Content-Type", "application/json")
 	encoder := json.NewEncoder(w)
@@ -211,10 +207,6 @@ func (h HTTPAPI) getSubscriptions(w http.ResponseWriter, r *http.Request, params
 		w.WriteHeader(http.StatusInternalServerError)
 		encoder.Encode(&Error{Error: err.Error()})
 	} else {
-		encoder.Encode(&subscriptions{subs})
+		encoder.Encode(&subscription.Subscriptions{Subscriptions: subs})
 	}
 }
-
-type subscriptions struct {
-	Subscriptions []*subscription.Subscription `json:"subscriptions"`
-}

subscription/subscription.go

@@ -15,6 +15,11 @@ type Subscription struct {
 	CORS       *CORS       `json:"cors,omitempty"`
 }
 
+// Subscriptions is an array of subscriptions.
+type Subscriptions struct {
+	Subscriptions []*Subscription `json:"subscriptions"`
+}
+
 // ID uniquely identifies a subscription.
 type ID string