min_hops within summary endpoint

skycoin · Jun 1, 2021 · 642fa40 · 642fa40
1 parent ecd81eb
commit 642fa40
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 72 deletions.
diff --git a/pkg/visor/api.go b/pkg/visor/api.go
@@ -71,7 +71,6 @@ type API interface {
 	UpdateStatus() (string, error)
 	RuntimeLogs() (string, error)
 
-	GetMinHops() (uint16, error)
 	SetMinHops(uint16) error
 }
 
@@ -140,6 +139,7 @@ type Summary struct {
 	IsHypervisor bool                           `json:"is_hypervisor,omitempty"`
 	DmsgStats    *dmsgtracker.DmsgClientSummary `json:"dmsg_stats"`
 	Online       bool                           `json:"online"`
+	MinHops      uint16                         `json:"min_hops"`
 }
 
 // Summary implements API.
@@ -178,6 +178,7 @@ func (v *Visor) Summary() (*Summary, error) {
 		Health:   health,
 		Uptime:   uptime,
 		Routes:   extraRoutes,
+		MinHops:  v.conf.Routing.MinHops,
 	}
 
 	return summary, nil
@@ -738,11 +739,6 @@ func (v *Visor) RuntimeLogs() (string, error) {
 	return builder.String(), nil
 }
 
-// GetMinHops gets min_hops routing config of visor
-func (v *Visor) GetMinHops() (uint16, error) {
-	return v.conf.Routing.MinHops, nil
-}
-
 // SetMinHops sets min_hops routing config of visor
 func (v *Visor) SetMinHops(in uint16) error {
 	return v.conf.UpdateMinHops(in)

diff --git a/pkg/visor/hypervisor.go b/pkg/visor/hypervisor.go
@@ -258,7 +258,6 @@ func (hv *Hypervisor) makeMux() chi.Router {
 				r.Get("/visors/{pk}/update/available", hv.visorUpdateAvailable())
 				r.Get("/visors/{pk}/update/available/{channel}", hv.visorUpdateAvailable())
 				r.Get("/visors/{pk}/runtime-logs", hv.getRuntimeLogs())
-				r.Get("/visors/{pk}/min-hops", hv.getMinHops())
 				r.Post("/visors/{pk}/min-hops", hv.postMinHops())
 			})
 		})
@@ -1298,24 +1297,6 @@ func (hv *Hypervisor) getRuntimeLogs() http.HandlerFunc {
 	})
 }
 
-func (hv *Hypervisor) getMinHops() http.HandlerFunc {
-	return hv.withCtx(hv.visorCtx, func(w http.ResponseWriter, r *http.Request, ctx *httpCtx) {
-		hops, err := ctx.API.GetMinHops()
-		if err != nil {
-			httputil.WriteJSON(w, r, http.StatusInternalServerError, err)
-			return
-		}
-
-		hopsResp := struct {
-			MinHops uint16 `json:"min_hops"`
-		}{
-			MinHops: hops,
-		}
-
-		httputil.WriteJSON(w, r, http.StatusOK, hopsResp)
-	})
-}
-
 func (hv *Hypervisor) postMinHops() http.HandlerFunc {
 	return hv.withCtx(hv.visorCtx, func(w http.ResponseWriter, r *http.Request, ctx *httpCtx) {
 		var reqBody struct {

diff --git a/pkg/visor/rpc.go b/pkg/visor/rpc.go
@@ -1,7 +1,6 @@
 package visor
 
 import (
-	"encoding/hex"
 	"errors"
 	"fmt"
 	"net/rpc"
@@ -147,40 +146,11 @@ func newTransportSummary(tm *transport.Manager, tp *transport.ManagedTransport,
 
 // Summary provides an extra summary of the AppNode.
 func (r *RPC) Summary(_ *struct{}, out *Summary) (err error) {
-	overview, err := r.visor.Overview()
-	if err != nil {
-		return fmt.Errorf("summary")
-	}
-
-	health, err := r.visor.Health()
-	if err != nil {
-		return fmt.Errorf("health")
-	}
-
-	uptime, err := r.visor.Uptime()
-	if err != nil {
-		return fmt.Errorf("uptime")
-	}
+	defer rpcutil.LogCall(r.log, "Summary", nil)(out, &err)
 
-	routes, err := r.visor.RoutingRules()
+	out, err = r.visor.Summary()
 	if err != nil {
-		return fmt.Errorf("routes")
-	}
-
-	extraRoutes := make([]routingRuleResp, 0, len(routes))
-	for _, route := range routes {
-		extraRoutes = append(extraRoutes, routingRuleResp{
-			Key:     route.KeyRouteID(),
-			Rule:    hex.EncodeToString(route),
-			Summary: route.Summary(),
-		})
-	}
-
-	*out = Summary{
-		Overview: overview,
-		Health:   health,
-		Uptime:   uptime,
-		Routes:   extraRoutes,
+		return err
 	}
 
 	return nil
@@ -547,13 +517,6 @@ func (r *RPC) RuntimeLogs(_ *struct{}, logs *string) (err error) {
 	return
 }
 
-// GetMinHops gets min_hops from visor's routing config
-func (r *RPC) GetMinHops(_ *struct{}, hops *uint16) (err error) {
-	defer rpcutil.LogCall(r.log, "GetMinHops", nil)
-	*hops, err = r.visor.GetMinHops()
-	return
-}
-
 // SetMinHops sets min_hops from visor's routing config
 func (r *RPC) SetMinHops(n *uint16, _ *struct{}) (err error) {
 	defer rpcutil.LogCall(r.log, "SetMinHops", *n)

diff --git a/pkg/visor/rpc_client.go b/pkg/visor/rpc_client.go
@@ -338,13 +338,6 @@ func (rc *rpcClient) RuntimeLogs() (string, error) {
 	return logs, err
 }
 
-// GetMinHops gets min_hops from visor routing config
-func (rc *rpcClient) GetMinHops() (uint16, error) {
-	var hops uint16
-	err := rc.Call("GetMinHops", &struct{}{}, &hops)
-	return hops, err
-}
-
 // SetMinHops sets the min_hops from visor routing config
 func (rc *rpcClient) SetMinHops(hops uint16) error {
 	err := rc.Call("SetMinHops", &hops, &struct{}{})