forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

p2p/discover: use existing defer, avoid double-close

Browse source
This commit is contained in:
Martin Holst Swende 2024-09-25 14:35:39 +02:00
parent 9e56ade561
commit 03d325ea8e
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
p2p/discover/v4_lookup_test.go
View file

@ -68,7 +68,11 @@ func TestUDPv4_Lookup(t *testing.T) {
func TestUDPv4_LookupIterator(t *testing.T) { func TestUDPv4_LookupIterator(t *testing.T) {
t.Parallel() t.Parallel()
test := newUDPTest(t) test := newUDPTest(t)
defer test.close() var wg sync.WaitGroup
defer func() {
test.close()
wg.Wait()
}()
// Seed table with initial nodes. // Seed table with initial nodes.
bootnodes := make([]*enode.Node, len(lookupTestnet.dists[256])) bootnodes := make([]*enode.Node, len(lookupTestnet.dists[256]))
@ -76,7 +80,6 @@ func TestUDPv4_LookupIterator(t *testing.T) {
bootnodes[i] = lookupTestnet.node(256, i) bootnodes[i] = lookupTestnet.node(256, i)
} }
fillTable(test.table, bootnodes, true) fillTable(test.table, bootnodes, true)
var wg sync.WaitGroup
wg.Add(1) wg.Add(1)
go func() { go func() {
serveTestnet(test, lookupTestnet) serveTestnet(test, lookupTestnet)
@ -101,8 +104,6 @@ func TestUDPv4_LookupIterator(t *testing.T) {
if err := checkNodesEqual(results, want); err != nil { if err := checkNodesEqual(results, want); err != nil {
t.Fatal(err) t.Fatal(err)
} }
test.close()
wg.Wait()
} }
// TestUDPv4_LookupIteratorClose checks that lookupIterator ends when its Close // TestUDPv4_LookupIteratorClose checks that lookupIterator ends when its Close
@ -110,7 +111,11 @@ func TestUDPv4_LookupIterator(t *testing.T) {
func TestUDPv4_LookupIteratorClose(t *testing.T) { func TestUDPv4_LookupIteratorClose(t *testing.T) {
t.Parallel() t.Parallel()
test := newUDPTest(t) test := newUDPTest(t)
defer test.close() var wg sync.WaitGroup
defer func() {
test.close()
wg.Wait()
}()
// Seed table with initial nodes. // Seed table with initial nodes.
bootnodes := make([]*enode.Node, len(lookupTestnet.dists[256])) bootnodes := make([]*enode.Node, len(lookupTestnet.dists[256]))
@ -119,7 +124,6 @@ func TestUDPv4_LookupIteratorClose(t *testing.T) {
} }
fillTable(test.table, bootnodes, true) fillTable(test.table, bootnodes, true)
var wg sync.WaitGroup
wg.Add(1) wg.Add(1)
go func() { go func() {
serveTestnet(test, lookupTestnet) serveTestnet(test, lookupTestnet)
@ -146,8 +150,6 @@ func TestUDPv4_LookupIteratorClose(t *testing.T) {
if n := it.Node(); n != nil { if n := it.Node(); n != nil {
t.Errorf("iterator returned non-nil node after close and %d more calls", ncalls) t.Errorf("iterator returned non-nil node after close and %d more calls", ncalls)
} }
test.close()
wg.Wait()
} }
func serveTestnet(test *udpTest, testnet *preminedTestnet) { func serveTestnet(test *udpTest, testnet *preminedTestnet) {