Merge pull request #4755 from ElrondNetwork/fix_peers_rating_handler_…

…decrease_call Add missing call to DecreaseRating on peersRatingHandler
multiversx · Dec 8, 2022 · 348a321 · 348a321
2 parents 1dbcfff + 15d5512
commit 348a321
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/dataRetriever/resolvers/topicResolverSender/topicResolverSender.go b/dataRetriever/resolvers/topicResolverSender/topicResolverSender.go
@@ -227,6 +227,7 @@ func (trs *topicResolverSender) sendOnTopic(
 		if err != nil {
 			continue
 		}
+		trs.peersRatingHandler.DecreaseRating(peer)
 
 		logData = append(logData, peerType)
 		logData = append(logData, peer.Pretty())

diff --git a/dataRetriever/resolvers/topicResolverSender/topicResolverSender_test.go b/dataRetriever/resolvers/topicResolverSender/topicResolverSender_test.go
@@ -282,13 +282,23 @@ func TestTopicResolverSender_SendOnRequestTopicShouldWorkAndNotSendToFullHistory
 			return []core.PeerID{pID2}
 		},
 	}
+	decreaseCalledCounter := 0
+	arg.PeersRatingHandler = &p2pmocks.PeersRatingHandlerStub{
+		DecreaseRatingCalled: func(pid core.PeerID) {
+			decreaseCalledCounter++
+			if !bytes.Equal(pid.Bytes(), pID1.Bytes()) && !bytes.Equal(pid.Bytes(), pID2.Bytes()) {
+				assert.Fail(t, "should be one of the provided pids")
+			}
+		},
+	}
 	trs, _ := topicResolverSender.NewTopicResolverSender(arg)
 
 	err := trs.SendOnRequestTopic(&dataRetriever.RequestData{}, defaultHashes)
 
 	assert.Nil(t, err)
 	assert.True(t, sentToPid1)
 	assert.True(t, sentToPid2)
+	assert.Equal(t, 2, decreaseCalledCounter)
 }
 
 func TestTopicResolverSender_SendOnRequestTopicShouldWorkAndSendToFullHistoryNodes(t *testing.T) {
@@ -317,11 +327,19 @@ func TestTopicResolverSender_SendOnRequestTopicShouldWorkAndSendToFullHistoryNod
 			return false
 		},
 	}
+	decreaseCalledCounter := 0
+	arg.PeersRatingHandler = &p2pmocks.PeersRatingHandlerStub{
+		DecreaseRatingCalled: func(pid core.PeerID) {
+			decreaseCalledCounter++
+			assert.Equal(t, pIDfullHistory, pid)
+		},
+	}
 	trs, _ := topicResolverSender.NewTopicResolverSender(arg)
 
 	err := trs.SendOnRequestTopic(&dataRetriever.RequestData{}, defaultHashes)
 	assert.Nil(t, err)
 	assert.True(t, sentToFullHistoryPeer)
+	assert.Equal(t, 1, decreaseCalledCounter)
 }
 
 func TestTopicResolverSender_SendOnRequestTopicShouldWorkAndSendToPreferredPeers(t *testing.T) {