94a8b296e4
Here we clean up internal uses of type discover.node, converting most code to use enode.Node instead. The discover.node type used to be the canonical representation of network hosts before ENR was introduced. Most code worked with *node to avoid conversions when interacting with Table methods. Since *node also contains internal state of Table and is a mutable type, using *node outside of Table code is prone to data races. It's also cleaner not having to wrap/unwrap *enode.Node all the time. discover.node has been renamed to tableNode to clarify its purpose. While here, we also change most uses of net.UDPAddr into netip.AddrPort. While this is technically a separate refactoring from the *node -> *enode.Node change, it is more convenient because *enode.Node handles IP addresses as netip.Addr. The switch to package netip in discovery would've happened very soon anyway. The change to netip.AddrPort stops at certain interface points. For example, since package p2p/netutil has not been converted to use netip.Addr yet, we still have to convert to net.IP/net.UDPAddr in a few places.
120 lines
3.8 KiB
Go
120 lines
3.8 KiB
Go
// Copyright 2024 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package discover
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/ethereum/go-ethereum/common/mclock"
|
|
"github.com/ethereum/go-ethereum/p2p/enode"
|
|
"github.com/ethereum/go-ethereum/p2p/enr"
|
|
)
|
|
|
|
// This test checks that revalidation can handle a node disappearing while
|
|
// a request is active.
|
|
func TestRevalidation_nodeRemoved(t *testing.T) {
|
|
var (
|
|
clock mclock.Simulated
|
|
transport = newPingRecorder()
|
|
tab, db = newInactiveTestTable(transport, Config{Clock: &clock})
|
|
tr = &tab.revalidation
|
|
)
|
|
defer db.Close()
|
|
|
|
// Add a node to the table.
|
|
node := nodeAtDistance(tab.self().ID(), 255, net.IP{77, 88, 99, 1})
|
|
tab.handleAddNode(addNodeOp{node: node})
|
|
|
|
// Start a revalidation request. Schedule once to get the next start time,
|
|
// then advance the clock to that point and schedule again to start.
|
|
next := tr.run(tab, clock.Now())
|
|
clock.Run(time.Duration(next + 1))
|
|
tr.run(tab, clock.Now())
|
|
if len(tr.activeReq) != 1 {
|
|
t.Fatal("revalidation request did not start:", tr.activeReq)
|
|
}
|
|
|
|
// Delete the node.
|
|
tab.deleteInBucket(tab.bucket(node.ID()), node.ID())
|
|
|
|
// Now finish the revalidation request.
|
|
var resp revalidationResponse
|
|
select {
|
|
case resp = <-tab.revalResponseCh:
|
|
case <-time.After(1 * time.Second):
|
|
t.Fatal("timed out waiting for revalidation")
|
|
}
|
|
tr.handleResponse(tab, resp)
|
|
|
|
// Ensure the node was not re-added to the table.
|
|
if tab.getNode(node.ID()) != nil {
|
|
t.Fatal("node was re-added to Table")
|
|
}
|
|
if tr.fast.contains(node.ID()) || tr.slow.contains(node.ID()) {
|
|
t.Fatal("removed node contained in revalidation list")
|
|
}
|
|
}
|
|
|
|
// This test checks that nodes with an updated endpoint remain in the fast revalidation list.
|
|
func TestRevalidation_endpointUpdate(t *testing.T) {
|
|
var (
|
|
clock mclock.Simulated
|
|
transport = newPingRecorder()
|
|
tab, db = newInactiveTestTable(transport, Config{Clock: &clock})
|
|
tr = &tab.revalidation
|
|
)
|
|
defer db.Close()
|
|
|
|
// Add node to table.
|
|
node := nodeAtDistance(tab.self().ID(), 255, net.IP{77, 88, 99, 1})
|
|
tab.handleAddNode(addNodeOp{node: node})
|
|
|
|
// Update the record in transport, including endpoint update.
|
|
record := node.Record()
|
|
record.Set(enr.IP{100, 100, 100, 100})
|
|
record.Set(enr.UDP(9999))
|
|
nodev2 := enode.SignNull(record, node.ID())
|
|
transport.updateRecord(nodev2)
|
|
|
|
// Start a revalidation request. Schedule once to get the next start time,
|
|
// then advance the clock to that point and schedule again to start.
|
|
next := tr.run(tab, clock.Now())
|
|
clock.Run(time.Duration(next + 1))
|
|
tr.run(tab, clock.Now())
|
|
if len(tr.activeReq) != 1 {
|
|
t.Fatal("revalidation request did not start:", tr.activeReq)
|
|
}
|
|
|
|
// Now finish the revalidation request.
|
|
var resp revalidationResponse
|
|
select {
|
|
case resp = <-tab.revalResponseCh:
|
|
case <-time.After(1 * time.Second):
|
|
t.Fatal("timed out waiting for revalidation")
|
|
}
|
|
tr.handleResponse(tab, resp)
|
|
|
|
if tr.fast.nodes[0].ID() != node.ID() {
|
|
t.Fatal("node not contained in fast revalidation list")
|
|
}
|
|
if tr.fast.nodes[0].isValidatedLive {
|
|
t.Fatal("node is marked live after endpoint change")
|
|
}
|
|
}
|