eth2wrap: fix node peer count

app/eth2wrap/httpwrap.go

@@ -23,6 +23,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"strconv"
 	"testing"
 	"time"
 
@@ -43,10 +44,7 @@ type BlockAttestationsProvider interface {
 
 // PeerCount is the response for querying beacon node peer count (/eth/v1/node/peer_count).
 type PeerCount struct {
-	Disconnected  int
-	Connecting    int
-	Connected     int
-	Disconnecting int
+	Connected int64
 }
 
 // NodePeerCountProvider is the interface for providing node peer count.
@@ -163,8 +161,15 @@ func (h *httpAdapter) NodePeerCount(ctx context.Context) (PeerCount, error) {
 	if err := json.Unmarshal(respBody, &resp); err != nil {
 		return PeerCount{}, errors.Wrap(err, "failed to parse beacon node peer count response")
 	}
+	if resp.Data.Connected == "" {
+		return PeerCount{}, errors.New("connected peers missing")
+	}
+	count, err := strconv.ParseInt(resp.Data.Connected, 10, 64)
+	if err != nil {
+		return PeerCount{}, errors.Wrap(err, "invalid value for connected peers")
+	}
 
-	return resp.Data, nil
+	return PeerCount{Connected: count}, nil
 }
 
 type submitBeaconCommitteeSelectionsJSON struct {
@@ -180,7 +185,9 @@ type attestationsJSON struct {
 }
 
 type peerCountJSON struct {
-	Data PeerCount `json:"data"`
+	Data struct {
+		Connected string `json:"connected"`
+	} `json:"data"`
 }
 
 func httpPost(ctx context.Context, base string, endpoint string, body io.Reader, timeout time.Duration) ([]byte, error) {

app/monitoringapi.go

@@ -220,7 +220,7 @@ func peerCounter(ctx context.Context, eth2Cl eth2wrap.Client, clock clockwork.Cl
 }
 
 // beaconNodePeerCount returns the number of connected peers of the beacon node.
-func beaconNodePeerCount(ctx context.Context, eth2Cl eth2wrap.Client) (int, error) {
+func beaconNodePeerCount(ctx context.Context, eth2Cl eth2wrap.Client) (int64, error) {
 	peerCount, err := eth2Cl.NodePeerCount(ctx)
 	if err != nil {
 		return 0, errors.Wrap(err, "get beacon node peer count")