Feat fix peers rating handler

api/groups/nodeGroup.go

@@ -17,15 +17,16 @@ import (
 )
 
 const (
-	pidQueryParam          = "pid"
-	debugPath              = "/debug"
-	heartbeatStatusPath    = "/heartbeatstatus"
-	metricsPath            = "/metrics"
-	p2pStatusPath          = "/p2pstatus"
-	peerInfoPath           = "/peerinfo"
-	statusPath             = "/status"
-	epochStartDataForEpoch = "/epoch-start/:epoch"
-	bootstrapStatusPath    = "/bootstrapstatus"
+	pidQueryParam             = "pid"
+	debugPath                 = "/debug"
+	heartbeatStatusPath       = "/heartbeatstatus"
+	metricsPath               = "/metrics"
+	p2pStatusPath             = "/p2pstatus"
+	peerInfoPath              = "/peerinfo"
+	statusPath                = "/status"
+	epochStartDataForEpoch    = "/epoch-start/:epoch"
+	bootstrapStatusPath       = "/bootstrapstatus"
+	connectedPeersRatingsPath = "/connected-peers-ratings"
 )
 
 // nodeFacadeHandler defines the methods to be implemented by a facade for node requests
@@ -35,6 +36,7 @@ type nodeFacadeHandler interface {
 	GetQueryHandler(name string) (debug.QueryHandler, error)
 	GetEpochStartDataAPI(epoch uint32) (*common.EpochStartDataAPI, error)
 	GetPeerInfo(pid string) ([]core.QueryP2PPeerInfo, error)
+	GetConnectedPeersRatings() string
 	IsInterfaceNil() bool
 }
 
@@ -102,6 +104,11 @@ func NewNodeGroup(facade nodeFacadeHandler) (*nodeGroup, error) {
 			Method:  http.MethodGet,
 			Handler: ng.bootstrapMetrics,
 		},
+		{
+			Path:    connectedPeersRatingsPath,
+			Method:  http.MethodGet,
+			Handler: ng.connectedPeersRatings,
+		},
 	}
 	ng.endpoints = endpoints
 
@@ -318,6 +325,19 @@ func (ng *nodeGroup) bootstrapMetrics(c *gin.Context) {
 	)
 }
 
+// connectedPeersRatings returns the node's connected peers ratings
+func (ng *nodeGroup) connectedPeersRatings(c *gin.Context) {
+	ratings := ng.getFacade().GetConnectedPeersRatings()
+	c.JSON(
+		http.StatusOK,
+		shared.GenericAPIResponse{
+			Data:  gin.H{"ratings": ratings},
+			Error: "",
+			Code:  shared.ReturnCodeSuccess,
+		},
+	)
+}
+
 func (ng *nodeGroup) getFacade() nodeFacadeHandler {
 	ng.mutFacade.RLock()
 	defer ng.mutFacade.RUnlock()

api/groups/nodeGroup_test.go

@@ -252,6 +252,37 @@ func TestBootstrapStatusMetrics_ShouldWork(t *testing.T) {
 	assert.True(t, valuesFound)
 }
 
+func TestBootstrapGetConnectedPeersRatings_ShouldWork(t *testing.T) {
+	providedRatings := map[string]string{
+		"pid1": "100",
+		"pid2": "-50",
+		"pid3": "-5",
+	}
+	buff, _ := json.Marshal(providedRatings)
+	facade := mock.FacadeStub{
+		GetConnectedPeersRatingsCalled: func() string {
+			return string(buff)
+		},
+	}
+
+	nodeGroup, err := groups.NewNodeGroup(&facade)
+	require.NoError(t, err)
+
+	ws := startWebServer(nodeGroup, "node", getNodeRoutesConfig())
+
+	req, _ := http.NewRequest("GET", "/node/connected-peers-ratings", nil)
+	resp := httptest.NewRecorder()
+	ws.ServeHTTP(resp, req)
+
+	response := &shared.GenericAPIResponse{}
+	loadResponse(resp.Body, response)
+	respMap, ok := response.Data.(map[string]interface{})
+	assert.True(t, ok)
+	ratings, ok := respMap["ratings"].(string)
+	assert.True(t, ok)
+	assert.Equal(t, string(buff), ratings)
+}
+
 func TestStatusMetrics_ShouldDisplayNonP2pMetrics(t *testing.T) {
 	statusMetricsProvider := statusHandler.NewStatusMetrics()
 	key := "test-details-key"
@@ -595,6 +626,7 @@ func getNodeRoutesConfig() config.ApiRoutesConfig {
 					{Name: "/peerinfo", Open: true},
 					{Name: "/epoch-start/:epoch", Open: true},
 					{Name: "/bootstrapstatus", Open: true},
+					{Name: "/connected-peers-ratings", Open: true},
 				},
 			},
 		},

api/mock/facadeStub.go

@@ -42,6 +42,7 @@ type FacadeStub struct {
 	GetQueryHandlerCalled                       func(name string) (debug.QueryHandler, error)
 	GetValueForKeyCalled                        func(address string, key string, options api.AccountQueryOptions) (string, api.BlockInfo, error)
 	GetPeerInfoCalled                           func(pid string) ([]core.QueryP2PPeerInfo, error)
+	GetConnectedPeersRatingsCalled              func() string
 	GetEpochStartDataAPICalled                  func(epoch uint32) (*common.EpochStartDataAPI, error)
 	GetThrottlerForEndpointCalled               func(endpoint string) (core.Throttler, bool)
 	GetUsernameCalled                           func(address string, options api.AccountQueryOptions) (string, api.BlockInfo, error)
@@ -371,6 +372,11 @@ func (f *FacadeStub) GetPeerInfo(pid string) ([]core.QueryP2PPeerInfo, error) {
 	return f.GetPeerInfoCalled(pid)
 }
 
+// GetConnectedPeersRatings -
+func (f *FacadeStub) GetConnectedPeersRatings() string {
+	return f.GetConnectedPeersRatingsCalled()
+}
+
 // GetEpochStartDataAPI -
 func (f *FacadeStub) GetEpochStartDataAPI(epoch uint32) (*common.EpochStartDataAPI, error) {
 	return f.GetEpochStartDataAPICalled(epoch)

api/shared/interface.go

@@ -98,6 +98,7 @@ type FacadeHandler interface {
 	GetQueryHandler(name string) (debug.QueryHandler, error)
 	GetEpochStartDataAPI(epoch uint32) (*common.EpochStartDataAPI, error)
 	GetPeerInfo(pid string) ([]core.QueryP2PPeerInfo, error)
+	GetConnectedPeersRatings() string
 	GetProof(rootHash string, address string) (*common.GetProofResponse, error)
 	GetProofDataTrie(rootHash string, address string, key string) (*common.GetProofResponse, *common.GetProofResponse, error)
 	GetProofCurrentRootHash(address string) (*common.GetProofResponse, error)

cmd/node/config/api.toml

@@ -35,7 +35,10 @@
         { Name = "/epoch-start/:epoch", Open = true },
 
         # /node/bootstrapstatus will return all metrics available during bootstrap
-        { Name = "/bootstrapstatus", Open = true }
+        { Name = "/bootstrapstatus", Open = true },
+
+        # /node/connected-peers-ratings will return the peers ratings
+        { Name = "/connected-peers-ratings", Open = true }
     ]
 
 [APIPackages.address]

cmd/node/config/config.toml

@@ -485,8 +485,8 @@
     Type = "LRU"
 
 [PeersRatingConfig]
-    TopRatedCacheCapacity = 5000
-    BadRatedCacheCapacity = 5000
+    TopRatedCacheCapacity           = 5000
+    BadRatedCacheCapacity           = 5000
 
 [PoolsCleanersConfig]
     MaxRoundsToKeepUnprocessedMiniBlocks = 300   # max number of rounds unprocessed miniblocks are kept in pool

config/overridableConfig/configOverriding_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/multiversx/mx-chain-go/config"
-	p2pConfig "github.com/multiversx/mx-chain-p2p-go/config"
+	p2pConfig "github.com/multiversx/mx-chain-go/p2p/config"
 	"github.com/stretchr/testify/require"
 )
 

consensus/mock/messageSigningHandlerMock.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 
 	"github.com/multiversx/mx-chain-go/p2p"
-	"github.com/multiversx/mx-chain-p2p-go/message"
+	"github.com/multiversx/mx-chain-go/p2p/factory"
 )
 
 // MessageSignerMock implements P2PSigningHandler interface but it does nothing as it is disabled
@@ -28,7 +28,7 @@ func (ms *MessageSignerMock) Serialize(messages []p2p.MessageP2P) ([]byte, error
 
 // Deserialize will unmarshal into a list of p2p messages
 func (ms *MessageSignerMock) Deserialize(messagesBytes []byte) ([]p2p.MessageP2P, error) {
-	var messages []*message.Message
+	var messages []*factory.Message
 	err := json.Unmarshal(messagesBytes, &messages)
 	if err != nil {
 		return nil, err

consensus/spos/bls/subroundEndRound_test.go

@@ -18,9 +18,10 @@ import (
 	"github.com/multiversx/mx-chain-go/consensus/spos/bls"
 	"github.com/multiversx/mx-chain-go/dataRetriever/blockchain"
 	"github.com/multiversx/mx-chain-go/p2p"
+	"github.com/multiversx/mx-chain-go/p2p/factory"
 	"github.com/multiversx/mx-chain-go/testscommon"
+	"github.com/multiversx/mx-chain-go/testscommon/p2pmocks"
 	"github.com/multiversx/mx-chain-go/testscommon/statusHandler"
-	"github.com/multiversx/mx-chain-p2p-go/message"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -1369,7 +1370,7 @@ func TestVerifyInvalidSigners(t *testing.T) {
 
 		container := mock.InitConsensusCore()
 
-		invalidSigners := []p2p.MessageP2P{&message.Message{
+		invalidSigners := []p2p.MessageP2P{&factory.Message{
 			FromField: []byte("from"),
 		}}
 		invalidSignersBytes, _ := container.Marshalizer().Marshal(invalidSigners)
@@ -1405,7 +1406,7 @@ func TestVerifyInvalidSigners(t *testing.T) {
 		}
 		consensusMsgBytes, _ := container.Marshalizer().Marshal(consensusMsg)
 
-		invalidSigners := []p2p.MessageP2P{&message.Message{
+		invalidSigners := []p2p.MessageP2P{&factory.Message{
 			FromField: []byte("from"),
 			DataField: consensusMsgBytes,
 		}}
@@ -1448,7 +1449,7 @@ func TestVerifyInvalidSigners(t *testing.T) {
 		}
 		consensusMsgBytes, _ := container.Marshalizer().Marshal(consensusMsg)
 
-		invalidSigners := []p2p.MessageP2P{&message.Message{
+		invalidSigners := []p2p.MessageP2P{&factory.Message{
 			FromField: []byte("from"),
 			DataField: consensusMsgBytes,
 		}}
@@ -1536,8 +1537,8 @@ func TestGetFullMessagesForInvalidSigners(t *testing.T) {
 		container.SetMessageSigningHandler(messageSigningHandler)
 
 		sr := *initSubroundEndRoundWithContainer(container, &statusHandler.AppStatusHandlerStub{})
-		sr.AddMessageWithSignature("B", &mock.P2PMessageMock{})
-		sr.AddMessageWithSignature("C", &mock.P2PMessageMock{})
+		sr.AddMessageWithSignature("B", &p2pmocks.P2PMessageMock{})
+		sr.AddMessageWithSignature("C", &p2pmocks.P2PMessageMock{})
 
 		invalidSigners := []string{"B", "C"}