Skip to content

Commit 140287d

Browse files
AskAlexSharovAskAlexSharov
authored
Merge branch 'main' into alex/up_x_dep_34
2 parents c990606 + 24cba3d commit 140287d

File tree

7 files changed

+68
-77
lines changed

7 files changed

+68
-77
lines changed

‎cl/sentinel/handlers/blobs_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ func getTestBlobSidecars(blockHeader *cltypes.SignedBeaconBlockHeader) []*cltype
6666
func TestBlobsByRangeHandler(t *testing.T) {
6767
ctx := context.Background()
6868

69-
listenAddrHost := "/ip4/127.0.0.1/tcp/6121"
70-
host, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost))
69+
host, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
7170
require.NoError(t, err)
71+
t.Cleanup(func() { host.Close() })
7272

73-
listenAddrHost1 := "/ip4/127.0.0.1/tcp/6358"
74-
host1, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost1))
73+
host1, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
7574
require.NoError(t, err)
75+
t.Cleanup(func() { host1.Close() })
7676

7777
err = host.Connect(ctx, peer.AddrInfo{
7878
ID: host1.ID(),
@@ -190,13 +190,13 @@ func TestBlobsByRangeHandler(t *testing.T) {
190190
func TestBlobsByIdentifiersHandler(t *testing.T) {
191191
ctx := context.Background()
192192

193-
listenAddrHost := "/ip4/127.0.0.1/tcp/6125"
194-
host, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost))
193+
host, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
195194
require.NoError(t, err)
195+
t.Cleanup(func() { host.Close() })
196196

197-
listenAddrHost1 := "/ip4/127.0.0.1/tcp/6350"
198-
host1, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost1))
197+
host1, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
199198
require.NoError(t, err)
199+
t.Cleanup(func() { host1.Close() })
200200

201201
err = host.Connect(ctx, peer.AddrInfo{
202202
ID: host1.ID(),

‎cl/sentinel/handlers/blocks_by_range_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ import (
4444
func TestBlocksByRootHandler(t *testing.T) {
4545
ctx := context.Background()
4646

47-
listenAddrHost := "/ip4/127.0.0.1/tcp/5000"
48-
host, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost))
47+
host, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
4948
require.NoError(t, err)
49+
t.Cleanup(func() { host.Close() })
5050

51-
listenAddrHost1 := "/ip4/127.0.0.1/tcp/5001"
52-
host1, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost1))
51+
host1, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
5352
require.NoError(t, err)
53+
t.Cleanup(func() { host1.Close() })
5454

5555
err = host.Connect(ctx, peer.AddrInfo{
5656
ID: host1.ID(),

‎cl/sentinel/handlers/blocks_by_root_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ import (
4646
func TestBlocksByRangeHandler(t *testing.T) {
4747
ctx := context.Background()
4848

49-
listenAddrHost := "/ip4/127.0.0.1/tcp/6000"
50-
host, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost))
49+
host, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
5150
require.NoError(t, err)
51+
t.Cleanup(func() { host.Close() })
5252

53-
listenAddrHost1 := "/ip4/127.0.0.1/tcp/6001"
54-
host1, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost1))
53+
host1, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
5554
require.NoError(t, err)
55+
t.Cleanup(func() { host1.Close() })
5656

5757
err = host.Connect(ctx, peer.AddrInfo{
5858
ID: host1.ID(),

‎cl/sentinel/handlers/heartbeats_test.go‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,12 @@ func newkey() *ecdsa.PrivateKey {
5858
return key
5959
}
6060

61-
func testLocalNode() *enode.LocalNode {
61+
func testLocalNode(t *testing.T) *enode.LocalNode {
6262
db, err := enode.OpenDBEx(context.TODO(), "", "", log.Root())
6363
if err != nil {
64-
panic(err)
64+
t.Fatal(err)
6565
}
66+
t.Cleanup(func() { db.Close() })
6667
ln := enode.NewLocalNode(db, newkey())
6768
ln.Set(enr.WithEntry("attnets", attnetsTestVal))
6869
ln.Set(enr.WithEntry("syncnets", syncnetsTestVal))
@@ -72,13 +73,13 @@ func testLocalNode() *enode.LocalNode {
7273
func TestPing(t *testing.T) {
7374
ctx := context.Background()
7475

75-
listenAddrHost := "/ip4/127.0.0.1/tcp/4501"
76-
host, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost))
76+
host, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
7777
require.NoError(t, err)
78+
t.Cleanup(func() { host.Close() })
7879

79-
listenAddrHost1 := "/ip4/127.0.0.1/tcp/4503"
80-
host1, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost1))
80+
host1, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
8181
require.NoError(t, err)
82+
t.Cleanup(func() { host1.Close() })
8283

8384
err = host.Connect(ctx, peer.AddrInfo{
8485
ID: host1.ID(),
@@ -100,7 +101,7 @@ func TestPing(t *testing.T) {
100101
host,
101102
peersPool,
102103
&clparams.NetworkConfig{},
103-
testLocalNode(),
104+
testLocalNode(t),
104105
beaconCfg,
105106
ethClock,
106107
nil, f, nil, nil, nil, true,
@@ -127,13 +128,13 @@ func TestPing(t *testing.T) {
127128
func TestGoodbye(t *testing.T) {
128129
ctx := context.Background()
129130

130-
listenAddrHost := "/ip4/127.0.0.1/tcp/4509"
131-
host, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost))
131+
host, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
132132
require.NoError(t, err)
133+
t.Cleanup(func() { host.Close() })
133134

134-
listenAddrHost1 := "/ip4/127.0.0.1/tcp/4512"
135-
host1, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost1))
135+
host1, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
136136
require.NoError(t, err)
137+
t.Cleanup(func() { host1.Close() })
137138

138139
err = host.Connect(ctx, peer.AddrInfo{
139140
ID: host1.ID(),
@@ -154,7 +155,7 @@ func TestGoodbye(t *testing.T) {
154155
host,
155156
peersPool,
156157
&clparams.NetworkConfig{},
157-
testLocalNode(),
158+
testLocalNode(t),
158159
beaconCfg,
159160
ethClock,
160161
nil, f, nil, nil, nil, true,
@@ -187,13 +188,13 @@ func TestGoodbye(t *testing.T) {
187188
func TestMetadataV2(t *testing.T) {
188189
ctx := context.Background()
189190

190-
listenAddrHost := "/ip4/127.0.0.1/tcp/2509"
191-
host, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost))
191+
host, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
192192
require.NoError(t, err)
193+
t.Cleanup(func() { host.Close() })
193194

194-
listenAddrHost1 := "/ip4/127.0.0.1/tcp/7510"
195-
host1, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost1))
195+
host1, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
196196
require.NoError(t, err)
197+
t.Cleanup(func() { host1.Close() })
197198

198199
err = host.Connect(ctx, peer.AddrInfo{
199200
ID: host1.ID(),
@@ -215,7 +216,7 @@ func TestMetadataV2(t *testing.T) {
215216
host,
216217
peersPool,
217218
&nc,
218-
testLocalNode(),
219+
testLocalNode(t),
219220
beaconCfg,
220221
ethClock,
221222
nil, f, nil, nil, nil, true,
@@ -245,13 +246,13 @@ func TestMetadataV2(t *testing.T) {
245246
func TestMetadataV1(t *testing.T) {
246247
ctx := context.Background()
247248

248-
listenAddrHost := "/ip4/127.0.0.1/tcp/4519"
249-
host, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost))
249+
host, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
250250
require.NoError(t, err)
251+
t.Cleanup(func() { host.Close() })
251252

252-
listenAddrHost1 := "/ip4/127.0.0.1/tcp/4578"
253-
host1, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost1))
253+
host1, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
254254
require.NoError(t, err)
255+
t.Cleanup(func() { host1.Close() })
255256

256257
err = host.Connect(ctx, peer.AddrInfo{
257258
ID: host1.ID(),
@@ -274,7 +275,7 @@ func TestMetadataV1(t *testing.T) {
274275
host,
275276
peersPool,
276277
&nc,
277-
testLocalNode(),
278+
testLocalNode(t),
278279
beaconCfg,
279280
ethClock,
280281
nil, f, nil, nil, nil, true,
@@ -303,13 +304,13 @@ func TestMetadataV1(t *testing.T) {
303304
func TestStatus(t *testing.T) {
304305
ctx := context.Background()
305306

306-
listenAddrHost := "/ip4/127.0.0.1/tcp/1519"
307-
host, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost))
307+
host, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
308308
require.NoError(t, err)
309+
t.Cleanup(func() { host.Close() })
309310

310-
listenAddrHost1 := "/ip4/127.0.0.1/tcp/4518"
311-
host1, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost1))
311+
host1, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
312312
require.NoError(t, err)
313+
t.Cleanup(func() { host1.Close() })
313314

314315
err = host.Connect(ctx, peer.AddrInfo{
315316
ID: host1.ID(),
@@ -361,7 +362,7 @@ func TestStatus(t *testing.T) {
361362
host,
362363
peersPool,
363364
&nc,
364-
testLocalNode(),
365+
testLocalNode(t),
365366
beaconCfg,
366367
getEthClock(t),
367368
hs, f, nil, nil, mockPeerDasStateReader, true,

‎cl/sentinel/handlers/light_client_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ var (
4848
func TestLightClientOptimistic(t *testing.T) {
4949
ctx := context.Background()
5050

51-
listenAddrHost := "/ip4/127.0.0.1/tcp/6011"
52-
host, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost))
51+
host, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
5352
require.NoError(t, err)
53+
t.Cleanup(func() { host.Close() })
5454

55-
listenAddrHost1 := "/ip4/127.0.0.1/tcp/6013"
56-
host1, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost1))
55+
host1, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
5756
require.NoError(t, err)
57+
t.Cleanup(func() { host1.Close() })
5858

5959
err = host.Connect(ctx, peer.AddrInfo{
6060
ID: host1.ID(),
@@ -119,13 +119,13 @@ func TestLightClientOptimistic(t *testing.T) {
119119
func TestLightClientFinality(t *testing.T) {
120120
ctx := context.Background()
121121

122-
listenAddrHost := "/ip4/127.0.0.1/tcp/6005"
123-
host, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost))
122+
host, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
124123
require.NoError(t, err)
124+
t.Cleanup(func() { host.Close() })
125125

126-
listenAddrHost1 := "/ip4/127.0.0.1/tcp/6006"
127-
host1, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost1))
126+
host1, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
128127
require.NoError(t, err)
128+
t.Cleanup(func() { host1.Close() })
129129

130130
err = host.Connect(ctx, peer.AddrInfo{
131131
ID: host1.ID(),
@@ -192,13 +192,13 @@ func TestLightClientBootstrap(t *testing.T) {
192192
ctx := context.Background()
193193
ethClock := getEthClock(t)
194194

195-
listenAddrHost := "/ip4/127.0.0.1/tcp/6007"
196-
host, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost))
195+
host, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
197196
require.NoError(t, err)
197+
t.Cleanup(func() { host.Close() })
198198

199-
listenAddrHost1 := "/ip4/127.0.0.1/tcp/6008"
200-
host1, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost1))
199+
host1, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
201200
require.NoError(t, err)
201+
t.Cleanup(func() { host1.Close() })
202202

203203
err = host.Connect(ctx, peer.AddrInfo{
204204
ID: host1.ID(),
@@ -275,13 +275,13 @@ func TestLightClientBootstrap(t *testing.T) {
275275
func TestLightClientUpdates(t *testing.T) {
276276
ctx := context.Background()
277277

278-
listenAddrHost := "/ip4/127.0.0.1/tcp/6009"
279-
host, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost))
278+
host, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
280279
require.NoError(t, err)
280+
t.Cleanup(func() { host.Close() })
281281

282-
listenAddrHost1 := "/ip4/127.0.0.1/tcp/6041"
283-
host1, err := libp2p.New(libp2p.ListenAddrStrings(listenAddrHost1))
282+
host1, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
284283
require.NoError(t, err)
284+
t.Cleanup(func() { host1.Close() })
285285

286286
err = host.Connect(ctx, peer.AddrInfo{
287287
ID: host1.ID(),

‎cmd/rpcdaemon/rpcdaemontest/test_util.go‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func CreateTestSentry(t *testing.T) (*mock.MockSentry, *blockgen.ChainPack, []*b
112112
t.Fatal(err)
113113
}
114114

115-
chain, err := getChainInstance(&addresses, m.ChainConfig, m.Genesis, m.Engine, m.DB, contractBackend)
115+
chain, err := generateChain(&addresses, m.ChainConfig, m.Genesis, m.Engine, m.DB, contractBackend)
116116
if err != nil {
117117
t.Fatal(err)
118118
}
@@ -127,23 +127,6 @@ func CreateTestSentry(t *testing.T) (*mock.MockSentry, *blockgen.ChainPack, []*b
127127
return m, chain, []*blockgen.ChainPack{orphanedChain}
128128
}
129129

130-
var chainInstance *blockgen.ChainPack
131-
132-
func getChainInstance(
133-
addresses *testAddresses,
134-
config *chain.Config,
135-
parent *types.Block,
136-
engine rules.Engine,
137-
db kv.TemporalRwDB,
138-
contractBackend *backends.SimulatedBackend,
139-
) (*blockgen.ChainPack, error) {
140-
var err error
141-
if chainInstance == nil {
142-
chainInstance, err = generateChain(addresses, config, parent, engine, db, contractBackend)
143-
}
144-
return chainInstance.Copy(), err
145-
}
146-
147130
func generateChain(
148131
addresses *testAddresses,
149132
config *chain.Config,

‎rpc/jsonrpc/debug_api_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,13 @@ func TestGetBadBlocks(t *testing.T) {
586586

587587
tx.Commit()
588588

589+
// Reset the global bad block cache so it reads only from this test's DB
590+
tx2, err := m.DB.BeginRo(ctx)
591+
require.NoError(err)
592+
defer tx2.Rollback()
593+
require.NoError(rawdb.ResetBadBlockCache(tx2, 100))
594+
tx2.Rollback()
595+
589596
data, err := api.GetBadBlocks(ctx)
590597
require.NoError(err)
591598

0 commit comments

Comments
 (0)