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

chore: add more info in err log

Browse source
This commit is contained in:
fearlessfe 2024-05-14 23:18:55 +08:00 committed by Chen Kai
parent 1e9efe7762
commit 0819e81eea
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/shisui/main.go
View file

@ -137,8 +137,7 @@ func startPortalRpcServer(config Config, conn discover.UDPConn, addr string) err
Addr: addr, Addr: addr,
Handler: server, Handler: server,
} }
httpServer.ListenAndServe() return httpServer.ListenAndServe()
return nil
} }
func initDiscV5(config Config, conn discover.UDPConn) (*discover.UDPv5, *enode.LocalNode, error) { func initDiscV5(config Config, conn discover.UDPConn) (*discover.UDPv5, *enode.LocalNode, error) {

6
p2p/discover/portal_protocol.go
View file

@ -406,7 +406,7 @@ func (p *PortalProtocol) pingInner(node *enode.Node) (*portalwire.Pong, error) {
talkResp, err := p.DiscV5.TalkRequest(node, p.protocolId, talkRequestBytes) talkResp, err := p.DiscV5.TalkRequest(node, p.protocolId, talkRequestBytes)
if err != nil { if err != nil {
p.Log.Error("ping error:", err) p.Log.Error("ping error:", "ip", node.IP().String(), "port", node.UDP(), "err", err)
p.replaceNode(node) p.replaceNode(node)
return nil, err return nil, err
} }
@ -439,7 +439,7 @@ func (p *PortalProtocol) findNodes(node *enode.Node, distances []uint) ([]*enode
talkResp, err := p.DiscV5.TalkRequest(node, p.protocolId, talkRequestBytes) talkResp, err := p.DiscV5.TalkRequest(node, p.protocolId, talkRequestBytes)
if err != nil { if err != nil {
p.Log.Error("failed to send find nodes request", "err", err) p.Log.Error("failed to send find nodes request", "ip", node.IP().String(), "port", node.UDP(), "err", err)
return nil, err return nil, err
} }
@ -464,7 +464,7 @@ func (p *PortalProtocol) findContent(node *enode.Node, contentKey []byte) (byte,
talkResp, err := p.DiscV5.TalkRequest(node, p.protocolId, talkRequestBytes) talkResp, err := p.DiscV5.TalkRequest(node, p.protocolId, talkRequestBytes)
if err != nil { if err != nil {
p.Log.Error("failed to send find content request", "err", err) p.Log.Error("failed to send find content request", "ip", node.IP().String(), "port", node.UDP(), "err", err)
return 0xff, nil, err return 0xff, nil, err
} }

5
portalnetwork/history/accumulator_test.go
View file

@ -92,6 +92,11 @@ func TestVerifyPostMergePreCapellaHeader(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.True(t, uint64(len(acc.HistoricalRoots)) < uint64(configs.Mainnet.HISTORICAL_ROOTS_LIMIT)) require.True(t, uint64(len(acc.HistoricalRoots)) < uint64(configs.Mainnet.HISTORICAL_ROOTS_LIMIT))
root := acc.HistoricalRoots.HashTreeRoot(configs.Mainnet, tree.GetHashFn())
hexutil.Encode(root[:])
require.Equal(t, hexutil.Encode(root[:]), "0x4df6b89755125d4f6c5575039a04e22301a5a49ee893c1d27e559e3eeab73da7")
file, err := os.ReadFile("./testdata/block_proofs_bellatrix/beacon_block_proof-15539558-cdf9ed89b0c43cda17398dc4da9cfc505e5ccd19f7c39e3b43474180f1051e01.yaml") file, err := os.ReadFile("./testdata/block_proofs_bellatrix/beacon_block_proof-15539558-cdf9ed89b0c43cda17398dc4da9cfc505e5ccd19f7c39e3b43474180f1051e01.yaml")
require.NoError(t, err) require.NoError(t, err)
proof := HistoricalRootsBlockProof{} proof := HistoricalRootsBlockProof{}