From d6fb1a21ccc2fbc44cb3a92795e09ad94b27516b Mon Sep 17 00:00:00 2001
From: Sorin Stanculeanu <sorinstanculeanu26@gmail.com>
Date: Tue, 8 Feb 2022 08:18:26 +0200
Subject: [PATCH] fixes after review

---
 dataRetriever/errors.go                                   | 7 ++-----
 dataRetriever/resolvers/peerAuthenticationResolver.go     | 6 +++---
 .../resolvers/peerAuthenticationResolver_test.go          | 8 ++++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dataRetriever/errors.go b/dataRetriever/errors.go
index ff3f898ece7..4569f471c92 100644
--- a/dataRetriever/errors.go
+++ b/dataRetriever/errors.go
@@ -224,11 +224,8 @@ var ErrNilEpochNotifier = errors.New("nil EpochNotifier")
 // ErrNilPeerAuthenticationPool signals that a nil peer authentication pool has been provided
 var ErrNilPeerAuthenticationPool = errors.New("nil peer authentication pool")
 
-// ErrNilHeartbeatPool signals that a nil heartbeat pool has been provided
-var ErrNilHeartbeatPool = errors.New("nil heartbeat pool")
-
-// ErrNotFound signals that a data is missing
-var ErrNotFound = errors.New("data not found")
+// ErrPeerAuthNotFound signals that no peer authentication found
+var ErrPeerAuthNotFound = errors.New("peer authentication not found")
 
 // ErrNilNodesCoordinator signals a nil nodes coordinator has been provided
 var ErrNilNodesCoordinator = errors.New("nil nodes coordinator")
diff --git a/dataRetriever/resolvers/peerAuthenticationResolver.go b/dataRetriever/resolvers/peerAuthenticationResolver.go
index 9760f77949d..312e3b18d30 100644
--- a/dataRetriever/resolvers/peerAuthenticationResolver.go
+++ b/dataRetriever/resolvers/peerAuthenticationResolver.go
@@ -120,7 +120,7 @@ func (res *peerAuthenticationResolver) RequestDataFromHashArray(hashes [][]byte,
 	)
 }
 
-// ProcessReceivedMessage will be the callback func from the p2p.Messenger and will be called each time a new message was received
+// ProcessReceivedMessage represents the callback func from the p2p.Messenger that is called each time a new message is received
 // (for the topic this validator was registered to, usually a request topic)
 func (res *peerAuthenticationResolver) ProcessReceivedMessage(message p2p.MessageP2P, fromConnectedPeer core.PeerID) error {
 	err := res.canProcessMessage(message, fromConnectedPeer)
@@ -287,7 +287,7 @@ func (res *peerAuthenticationResolver) fetchPeerAuthenticationSlicesForPublicKey
 	}
 
 	if len(peerAuths) == 0 {
-		return nil, dataRetriever.ErrNotFound
+		return nil, dataRetriever.ErrPeerAuthNotFound
 	}
 
 	return peerAuths, nil
@@ -300,7 +300,7 @@ func (res *peerAuthenticationResolver) fetchPeerAuthenticationAsByteSlice(pk []b
 		return res.marshalizer.Marshal(value)
 	}
 
-	return nil, dataRetriever.ErrNotFound
+	return nil, dataRetriever.ErrPeerAuthNotFound
 }
 
 // IsInterfaceNil returns true if there is no value under the interface
diff --git a/dataRetriever/resolvers/peerAuthenticationResolver_test.go b/dataRetriever/resolvers/peerAuthenticationResolver_test.go
index 0bc7f153b6d..ce7f7d6b211 100644
--- a/dataRetriever/resolvers/peerAuthenticationResolver_test.go
+++ b/dataRetriever/resolvers/peerAuthenticationResolver_test.go
@@ -140,7 +140,7 @@ func TestNewPeerAuthenticationResolver(t *testing.T) {
 	})
 }
 
-func Test_peerAuthenticationResolver_ProcessReceivedMessage(t *testing.T) {
+func TestPeerAuthenticationResolver_ProcessReceivedMessage(t *testing.T) {
 	t.Parallel()
 
 	t.Run("nil message should error", func(t *testing.T) {
@@ -275,7 +275,7 @@ func Test_peerAuthenticationResolver_ProcessReceivedMessage(t *testing.T) {
 		epoch := uint32(0)
 		chunkIndex := uint32(0)
 		err = res.ProcessReceivedMessage(createRequestMsgWithChunkIndex(dataRetriever.ChunkType, []byte(""), epoch, chunkIndex), fromConnectedPeer)
-		assert.True(t, errors.Is(err, dataRetriever.ErrNotFound))
+		assert.True(t, errors.Is(err, dataRetriever.ErrPeerAuthNotFound))
 		expectedSubstrErr := fmt.Sprintf("%s %d", "from chunk", chunkIndex)
 		assert.True(t, strings.Contains(fmt.Sprintf("%s", err), expectedSubstrErr))
 		assert.False(t, wasSent)
@@ -535,7 +535,7 @@ func Test_peerAuthenticationResolver_ProcessReceivedMessage(t *testing.T) {
 	})
 }
 
-func Test_peerAuthenticationResolver_RequestShouldError(t *testing.T) {
+func TestPeerAuthenticationResolver_RequestShouldError(t *testing.T) {
 	t.Parallel()
 
 	arg := createMockArgPeerAuthenticationResolver()
@@ -571,7 +571,7 @@ func Test_peerAuthenticationResolver_RequestShouldError(t *testing.T) {
 
 }
 
-func Test_peerAuthenticationResolver_RequestShouldWork(t *testing.T) {
+func TestPeerAuthenticationResolver_RequestShouldWork(t *testing.T) {
 	t.Parallel()
 
 	arg := createMockArgPeerAuthenticationResolver()