forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat:unify Ping method signature

Browse source 
Signed-off-by: Chen Kai <281165273grape@gmail.com>
This commit is contained in:
Chen Kai 2025-03-12 10:50:51 +01:00
parent b61b1053f0
commit b26e0a8593
4 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/devp2p/discv4cmd.go
View file

@ -163,7 +163,7 @@ func discv4Ping(ctx *cli.Context) error {
defer disc.Close() defer disc.Close()
start := time.Now() start := time.Now()
if err := disc.PingWithoutResp(n); err != nil { if _, err := disc.Ping(n); err != nil {
return fmt.Errorf("node didn't respond: %v", err) return fmt.Errorf("node didn't respond: %v", err)
} }
fmt.Printf("node responded to ping (RTT %v).\n", time.Since(start)) fmt.Printf("node responded to ping (RTT %v).\n", time.Since(start))

3
cmd/devp2p/discv5cmd.go
View file

@ -84,7 +84,8 @@ func discv5Ping(ctx *cli.Context) error {
disc, _ := startV5(ctx) disc, _ := startV5(ctx)
defer disc.Close() defer disc.Close()
fmt.Println(disc.PingWithoutResp(n)) _, err := disc.Ping(n)
fmt.Println(err)
return nil return nil
} }

19
p2p/discover/v4_udp.go
View file

@ -210,12 +210,6 @@ func (t *UDPv4) ourEndpoint() v4wire.Endpoint {
return v4wire.NewEndpoint(addr, uint16(node.TCP())) return v4wire.NewEndpoint(addr, uint16(node.TCP()))
} }
// PingWithoutResp sends a ping message to the given node.
func (t *UDPv4) PingWithoutResp(n *enode.Node) error {
_, err := t.ping(n)
return err
}
// ping sends a ping message to the given node and waits for a reply. // ping sends a ping message to the given node and waits for a reply.
func (t *UDPv4) ping(n *enode.Node) (seq uint64, err error) { func (t *UDPv4) ping(n *enode.Node) (seq uint64, err error) {
addr, ok := n.UDPEndpoint() addr, ok := n.UDPEndpoint()
@ -229,6 +223,19 @@ func (t *UDPv4) ping(n *enode.Node) (seq uint64, err error) {
return seq, err return seq, err
} }
// Ping calls PING on a node and waits for a PONG response.
func (t *UDPv4) Ping(n *enode.Node) (pong *v4wire.Pong, err error) {
addr, ok := n.UDPEndpoint()
if !ok {
return nil, errNoUDPEndpoint
}
rm := t.sendPing(n.ID(), addr, nil)
if err = <-rm.errc; err == nil {
pong = rm.reply.(*v4wire.Pong)
}
return pong, err
}
// sendPing sends a ping message to the given node and invokes the callback // sendPing sends a ping message to the given node and invokes the callback
// when the reply arrives. // when the reply arrives.
func (t *UDPv4) sendPing(toid enode.ID, toaddr netip.AddrPort, callback func()) *replyMatcher { func (t *UDPv4) sendPing(toid enode.ID, toaddr netip.AddrPort, callback func()) *replyMatcher {

12
p2p/discover/v5_udp.go
View file

@ -200,12 +200,6 @@ func (t *UDPv5) Close() {
}) })
} }
// PingWithoutResp sends a ping message to the given node.
func (t *UDPv5) PingWithoutResp(n *enode.Node) error {
_, err := t.ping(n)
return err
}
// Resolve searches for a specific node with the given ID and tries to get the most recent // Resolve searches for a specific node with the given ID and tries to get the most recent
// version of the node record for it. It returns n if the node could not be resolved. // version of the node record for it. It returns n if the node could not be resolved.
func (t *UDPv5) Resolve(n *enode.Node) *enode.Node { func (t *UDPv5) Resolve(n *enode.Node) *enode.Node {
@ -400,7 +394,7 @@ func lookupDistances(target, dest enode.ID) (dists []uint) {
// ping calls PING on a node and waits for a PONG response. // ping calls PING on a node and waits for a PONG response.
func (t *UDPv5) ping(n *enode.Node) (uint64, error) { func (t *UDPv5) ping(n *enode.Node) (uint64, error) {
pong, err := t.PingWithResp(n) pong, err := t.Ping(n)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -408,8 +402,8 @@ func (t *UDPv5) ping(n *enode.Node) (uint64, error) {
return pong.ENRSeq, nil return pong.ENRSeq, nil
} }
// PingWithResp calls PING on a node and waits for a PONG response. // Ping calls PING on a node and waits for a PONG response.
func (t *UDPv5) PingWithResp(n *enode.Node) (*v5wire.Pong, error) { func (t *UDPv5) Ping(n *enode.Node) (*v5wire.Pong, error) {
req := &v5wire.Ping{ENRSeq: t.localNode.Node().Seq()} req := &v5wire.Ping{ENRSeq: t.localNode.Node().Seq()}
resp := t.callToNode(n, v5wire.PongMsg, req) resp := t.callToNode(n, v5wire.PongMsg, req)
defer t.callDone(resp) defer t.callDone(resp)