Less Chaotic Service Initialization

prysmaticlabs · Aug 22, 2024 · a5cc0fd · a5cc0fd
1 parent 2ea7c37
commit a5cc0fd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/beacon-chain/p2p/testing/p2p.go b/beacon-chain/p2p/testing/p2p.go
@@ -24,7 +24,6 @@ import (
 	"github.com/multiformats/go-multiaddr"
 	ssz "github.com/prysmaticlabs/fastssz"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/peerdas"
-	"github.com/prysmaticlabs/prysm/v5/beacon-chain/p2p"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/p2p/encoder"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/p2p/peers"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/p2p/peers/scorers"
@@ -47,7 +46,7 @@ const (
 type TestP2P struct {
 	t               *testing.T
 	BHost           host.Host
-	UseNodeID       bool
+	EnodeID         enode.ID
 	pubsub          *pubsub.PubSub
 	joinedTopics    map[string]*pubsub.Topic
 	BroadcastCalled atomic.Bool
@@ -280,14 +279,7 @@ func (*TestP2P) ENR() *enr.Record {
 
 // NodeID returns the node id of the local peer.
 func (p *TestP2P) NodeID() enode.ID {
-	if p.UseNodeID {
-		nodeID, err := p2p.ConvertPeerIDToNodeID(p.BHost.ID())
-		if err != nil {
-			p.t.Fatal(err)
-		}
-		return nodeID
-	}
-	return [32]byte{}
+	return p.EnodeID
 }
 
 // DiscoveryAddresses --

diff --git a/beacon-chain/sync/initial-sync/blocks_fetcher_test.go b/beacon-chain/sync/initial-sync/blocks_fetcher_test.go
@@ -2071,13 +2071,15 @@ func TestFetchDataColumnsFromPeers(t *testing.T) {
 			chain, clock := defaultMockChain(t, tc.currentSlot)
 
 			// Create the P2P service.
-			p2p := p2ptest.NewTestP2P(t, swarmt.OptPeerPrivateKey(genFixedCustodyPeer(t)))
-			p2p.UseNodeID = true
+			p2pSvc := p2ptest.NewTestP2P(t, swarmt.OptPeerPrivateKey(genFixedCustodyPeer(t)))
+			nodeID, err := p2p.ConvertPeerIDToNodeID(p2pSvc.PeerID())
+			require.NoError(t, err)
+			p2pSvc.EnodeID = nodeID
 
 			// Connect the peers.
 			peers := make([]*p2ptest.TestP2P, 0, len(tc.peersParams))
 			for i, peerParams := range tc.peersParams {
-				peer := createAndConnectPeer(t, p2p, chain, dataColumnsSidecarFromSlot, peerParams, i)
+				peer := createAndConnectPeer(t, p2pSvc, chain, dataColumnsSidecarFromSlot, peerParams, i)
 				peers = append(peers, peer)
 			}
 
@@ -2097,7 +2099,7 @@ func TestFetchDataColumnsFromPeers(t *testing.T) {
 			blocksFetcher := newBlocksFetcher(ctx, &blocksFetcherConfig{
 				clock:  clock,
 				ctxMap: map[[4]byte]int{{245, 165, 253, 66}: version.Deneb},
-				p2p:    p2p,
+				p2p:    p2pSvc,
 				bs:     blobStorageSummarizer,
 			})