From 39f3fbb446b6957b99b3fc94f96ea0c20e3a8250 Mon Sep 17 00:00:00 2001
From: rene <41963722+renaynay@users.noreply.github.com>
Date: Mon, 26 Jun 2023 14:23:34 +0200
Subject: [PATCH] refactor(p2p): implement hlib suggestions

---
 p2p/options.go           |  3 ++-
 p2p/peer_tracker.go      |  2 +-
 p2p/peer_tracker_test.go | 15 ++-------------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/p2p/options.go b/p2p/options.go
index f1e40b91..7ba1d82d 100644
--- a/p2p/options.go
+++ b/p2p/options.go
@@ -171,7 +171,8 @@ func WithChainID[T ClientParameters](chainID string) Option[T] {
 	}
 }
 
-// TODO @renaynay
+// WithPeerIDStore is a functional option that sets a peerIDStore to be used
+// inside the peerTracker.
 func WithPeerIDStore[T ClientParameters](pidstore PeerIDStore) Option[T] {
 	return func(p *T) {
 		switch t := any(p).(type) { //nolint:gocritic
diff --git a/p2p/peer_tracker.go b/p2p/peer_tracker.go
index f1d5b444..b808c363 100644
--- a/p2p/peer_tracker.go
+++ b/p2p/peer_tracker.go
@@ -195,7 +195,7 @@ func (p *peerTracker) gc() {
 }
 
 // dumpPeers stores peers to the peerTracker's PeerIDStore if
-// it exists.
+// present.
 func (p *peerTracker) dumpPeers(ctx context.Context) {
 	if p.pidstore == nil {
 		return
diff --git a/p2p/peer_tracker_test.go b/p2p/peer_tracker_test.go
index cdf08a87..66f9c613 100644
--- a/p2p/peer_tracker_test.go
+++ b/p2p/peer_tracker_test.go
@@ -2,8 +2,6 @@ package p2p
 
 import (
 	"context"
-	"crypto/rand"
-	"crypto/rsa"
 	"encoding/json"
 	"errors"
 	"testing"
@@ -11,8 +9,8 @@ import (
 
 	"github.com/ipfs/go-datastore"
 	"github.com/ipfs/go-datastore/sync"
-	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/peer"
+	testpeer "github.com/libp2p/go-libp2p/core/test"
 	"github.com/libp2p/go-libp2p/p2p/net/conngater"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -109,16 +107,7 @@ func (d *dummyPIDStore) Load(ctx context.Context) ([]peer.ID, error) {
 func generateRandomPeerlist(t *testing.T, length int) []peer.ID {
 	peerlist := make([]peer.ID, length)
 	for i := range peerlist {
-		key, err := rsa.GenerateKey(rand.Reader, 2096)
-		require.NoError(t, err)
-
-		_, pubkey, err := crypto.KeyPairFromStdKey(key)
-		require.NoError(t, err)
-
-		peerID, err := peer.IDFromPublicKey(pubkey)
-		require.NoError(t, err)
-
-		peerlist[i] = peerID
+		peerlist[i] = testpeer.RandPeerIDFatal(t)
 	}
 	return peerlist
 }