Change response of '/nodes/{all,enabled}' HTTP API routes.

Now responses include 'specific' nodes.
wavesplatform · Oct 4, 2024 · 75f1db1 · 75f1db1
1 parent b2192fe
commit 75f1db1
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/pkg/api/api.go b/pkg/api/api.go
@@ -263,26 +263,41 @@ func cleanCRLF(s string) string {
 	return cleaned
 }
 
+type nodesResponse struct {
+	Regular  proto.NonNullableSlice[entities.Node] `json:"regular"`
+	Specific proto.NonNullableSlice[entities.Node] `json:"specific"`
+}
+
 func (a *API) nodes(w http.ResponseWriter, _ *http.Request) {
 	regularNodes, err := a.nodesStorage.Nodes(false)
 	if err != nil {
 		http.Error(w, fmt.Sprintf("Failed to complete request: %v", err), http.StatusInternalServerError)
 		return
 	}
-	err = json.NewEncoder(w).Encode(regularNodes)
+	specificNodes, err := a.nodesStorage.Nodes(true)
+	if err != nil {
+		http.Error(w, fmt.Sprintf("Failed to complete request: %v", err), http.StatusInternalServerError)
+		return
+	}
+	err = json.NewEncoder(w).Encode(nodesResponse{Regular: regularNodes, Specific: specificNodes})
 	if err != nil {
 		http.Error(w, fmt.Sprintf("Failed to marshal nodes to JSON: %v", err), http.StatusInternalServerError)
 		return
 	}
 }
 
 func (a *API) enabled(w http.ResponseWriter, _ *http.Request) {
-	enabledNodes, err := a.nodesStorage.EnabledNodes()
+	enabledRegularNodes, err := a.nodesStorage.EnabledNodes()
+	if err != nil {
+		http.Error(w, fmt.Sprintf("Failed to complete request: %v", err), http.StatusInternalServerError)
+		return
+	}
+	enabledSpecificNodes, err := a.nodesStorage.EnabledSpecificNodes()
 	if err != nil {
 		http.Error(w, fmt.Sprintf("Failed to complete request: %v", err), http.StatusInternalServerError)
 		return
 	}
-	err = json.NewEncoder(w).Encode(enabledNodes)
+	err = json.NewEncoder(w).Encode(nodesResponse{Regular: enabledRegularNodes, Specific: enabledSpecificNodes})
 	if err != nil {
 		http.Error(w, fmt.Sprintf("Failed to marshal nodes to JSON: %v", err), http.StatusInternalServerError)
 		return