[devnet] separare logging - headers download (#7551)

Co-authored-by: Alex Sharp <alexsharp@Alexs-MacBook-Pro-2.local>

cmd/sentry/sentry/sentry_multi_client.go

@@ -296,6 +296,7 @@ func NewMultiClient(
 		1024*1024, /* linkLimit */
 		engine,
 		blockReader,
+		logger,
 	)
 	if chainConfig.TerminalTotalDifficultyPassed {
 		hd.SetPOSSync(true)

ethdb/privateapi/engine_test.go

@@ -88,15 +88,16 @@ func makeTestDb(ctx context.Context, db kv.RwDB) {
 }
 
 func TestMockDownloadRequest(t *testing.T) {
+	logger := log.New()
 	db := memdb.NewTestDB(t)
 	ctx := context.Background()
 	require := require.New(t)
 
 	makeTestDb(ctx, db)
-	hd := headerdownload.NewHeaderDownload(0, 0, nil, nil)
+	hd := headerdownload.NewHeaderDownload(0, 0, nil, nil, logger)
 	hd.SetPOSSync(true)
 	events := shards.NewEvents()
-	backend := NewEthBackendServer(ctx, nil, db, events, nil, &chain.Config{TerminalTotalDifficulty: libcommon.Big1}, nil, hd, false, log.New())
+	backend := NewEthBackendServer(ctx, nil, db, events, nil, &chain.Config{TerminalTotalDifficulty: libcommon.Big1}, nil, hd, false, logger)
 
 	var err error
 	var reply *remote.EnginePayloadStatus
@@ -145,17 +146,18 @@ func TestMockDownloadRequest(t *testing.T) {
 }
 
 func TestMockValidExecution(t *testing.T) {
+	logger := log.New()
 	db := memdb.NewTestDB(t)
 	ctx := context.Background()
 	require := require.New(t)
 
 	makeTestDb(ctx, db)
 
-	hd := headerdownload.NewHeaderDownload(0, 0, nil, nil)
+	hd := headerdownload.NewHeaderDownload(0, 0, nil, nil, logger)
 	hd.SetPOSSync(true)
 
 	events := shards.NewEvents()
-	backend := NewEthBackendServer(ctx, nil, db, events, nil, &chain.Config{TerminalTotalDifficulty: libcommon.Big1}, nil, hd, false, log.New())
+	backend := NewEthBackendServer(ctx, nil, db, events, nil, &chain.Config{TerminalTotalDifficulty: libcommon.Big1}, nil, hd, false, logger)
 
 	var err error
 	var reply *remote.EnginePayloadStatus
@@ -181,17 +183,18 @@ func TestMockValidExecution(t *testing.T) {
 }
 
 func TestMockInvalidExecution(t *testing.T) {
+	logger := log.New()
 	db := memdb.NewTestDB(t)
 	ctx := context.Background()
 	require := require.New(t)
 
 	makeTestDb(ctx, db)
 
-	hd := headerdownload.NewHeaderDownload(0, 0, nil, nil)
+	hd := headerdownload.NewHeaderDownload(0, 0, nil, nil, logger)
 	hd.SetPOSSync(true)
 
 	events := shards.NewEvents()
-	backend := NewEthBackendServer(ctx, nil, db, events, nil, &chain.Config{TerminalTotalDifficulty: libcommon.Big1}, nil, hd, false, log.New())
+	backend := NewEthBackendServer(ctx, nil, db, events, nil, &chain.Config{TerminalTotalDifficulty: libcommon.Big1}, nil, hd, false, logger)
 
 	var err error
 	var reply *remote.EnginePayloadStatus
@@ -217,16 +220,17 @@ func TestMockInvalidExecution(t *testing.T) {
 }
 
 func TestNoTTD(t *testing.T) {
+	logger := log.New()
 	db := memdb.NewTestDB(t)
 	ctx := context.Background()
 	require := require.New(t)
 
 	makeTestDb(ctx, db)
 
-	hd := headerdownload.NewHeaderDownload(0, 0, nil, nil)
+	hd := headerdownload.NewHeaderDownload(0, 0, nil, nil, logger)
 
 	events := shards.NewEvents()
-	backend := NewEthBackendServer(ctx, nil, db, events, nil, &chain.Config{}, nil, hd, false, log.New())
+	backend := NewEthBackendServer(ctx, nil, db, events, nil, &chain.Config{}, nil, hd, false, logger)
 
 	var err error
 

p2p/discover/v5_lookup_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/ledgerwatch/erigon/p2p/discover/v5wire"
 	"github.com/ledgerwatch/erigon/p2p/enode"
+	"github.com/ledgerwatch/log/v3"
 )
 
 // This test checks that lookup works.
@@ -19,7 +20,8 @@ func TestUDPv5_lookup(t *testing.T) {
 		t.Skip("fix me on win please")
 	}
 	t.Parallel()
-	test := newUDPV5Test(t)
+	logger := log.New()
+	test := newUDPV5Test(t, logger)
 	t.Cleanup(test.close)
 
 	// Lookup on empty table returns no nodes.
@@ -31,7 +33,7 @@ func TestUDPv5_lookup(t *testing.T) {
 	for d, nn := range lookupTestnet.dists {
 		for i, key := range nn {
 			n := lookupTestnet.node(d, i)
-			test.getNode(key, &net.UDPAddr{IP: n.IP(), Port: n.UDP()})
+			test.getNode(key, &net.UDPAddr{IP: n.IP(), Port: n.UDP()}, logger)
 		}
 	}
 
@@ -53,7 +55,7 @@ func TestUDPv5_lookup(t *testing.T) {
 			recipient, key := lookupTestnet.nodeByAddr(to)
 			switch p := p.(type) {
 			case *v5wire.Ping:
-				test.packetInFrom(key, to, &v5wire.Pong{ReqID: p.ReqID})
+				test.packetInFrom(key, to, &v5wire.Pong{ReqID: p.ReqID}, logger)
 			case *v5wire.Findnode:
 				if asked[recipient.ID()] {
 					t.Error("Asked node", recipient.ID(), "twice")
@@ -62,7 +64,7 @@ func TestUDPv5_lookup(t *testing.T) {
 				nodes := lookupTestnet.neighborsAtDistances(recipient, p.Distances, 16)
 				t.Logf("Got FINDNODE for %v, returning %d nodes", p.Distances, len(nodes))
 				for _, resp := range packNodes(p.ReqID, nodes) {
-					test.packetInFrom(key, to, resp)
+					test.packetInFrom(key, to, resp, logger)
 				}
 			}
 		})
@@ -79,8 +81,9 @@ func TestUDPv5_lookupE2E(t *testing.T) {
 		t.Skip("fix me on win please")
 	}
 	t.Parallel()
+	logger := log.New()
 
-	bootNode := startLocalhostV5(t, Config{})
+	bootNode := startLocalhostV5(t, Config{}, logger)
 	bootNodeRec := bootNode.Self()
 
 	const N = 5
@@ -89,7 +92,7 @@ func TestUDPv5_lookupE2E(t *testing.T) {
 		cfg := Config{
 			Bootnodes: []*enode.Node{bootNodeRec},
 		}
-		node := startLocalhostV5(t, cfg)
+		node := startLocalhostV5(t, cfg, logger)
 		nodes = append(nodes, node)
 	}
 

p2p/discover/v5_udp_integration_test.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/ledgerwatch/erigon/p2p/discover/v5wire"
+	"github.com/ledgerwatch/log/v3"
 )
 
 // This test checks that calls with n replies may take up to n * respTimeout.
@@ -18,6 +19,7 @@ func TestUDPv5_callTimeoutReset(t *testing.T) {
 		t.Skip("fix me on win please")
 	}
 	t.Parallel()
+	logger := log.New()
 
 	replyTimeout := respTimeoutV5
 	// This must be significantly lower than replyTimeout to not get "RPC timeout" error.
@@ -32,13 +34,13 @@ func TestUDPv5_callTimeoutReset(t *testing.T) {
 	ctx := context.Background()
 	ctx = contextWithReplyTimeout(ctx, replyTimeout)
 
-	test := newUDPV5TestContext(ctx, t)
+	test := newUDPV5TestContext(ctx, t, logger)
 	t.Cleanup(test.close)
 
 	// Launch the request:
 	var (
 		distance = uint(230)
-		remote   = test.getNode(test.remotekey, test.remoteaddr).Node()
+		remote   = test.getNode(test.remotekey, test.remoteaddr, logger).Node()
 		nodes    = nodesAtDistance(remote.ID(), int(distance), totalNodesResponseLimit)
 		done     = make(chan error, 1)
 	)
@@ -55,7 +57,7 @@ func TestUDPv5_callTimeoutReset(t *testing.T) {
 				ReqID: p.ReqID,
 				Total: totalNodesResponseLimit,
 				Nodes: nodesToRecords(nodes[i : i+1]),
-			})
+			}, logger)
 		}
 	})
 	if err := <-done; err != nil {