tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

beacon/types, cmd/devp2p, p2p/enr: clean up uses of fmt.Errorf (#30182)

Browse Source
This commit is contained in:
yukionfire 2024-07-25 06:32:58 +08:00 committed by GitHub
parent 4ad88e9463
commit 4dfc75deef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon/types/beacon_block.go
View File

@ -48,7 +48,7 @@ func BlockFromJSON(forkName string, data []byte) (*BeaconBlock, error) {
case "capella": case "capella":
obj = new(capella.BeaconBlock) obj = new(capella.BeaconBlock)
default: default:
return nil, fmt.Errorf("unsupported fork: " + forkName) return nil, fmt.Errorf("unsupported fork: %s", forkName)
} }
if err := json.Unmarshal(data, obj); err != nil { if err := json.Unmarshal(data, obj); err != nil {
return nil, err return nil, err

2
beacon/types/exec_header.go
View File

@ -46,7 +46,7 @@ func ExecutionHeaderFromJSON(forkName string, data []byte) (*ExecutionHeader, er
case "deneb": case "deneb":
obj = new(deneb.ExecutionPayloadHeader) obj = new(deneb.ExecutionPayloadHeader)
default: default:
return nil, fmt.Errorf("unsupported fork: " + forkName) return nil, fmt.Errorf("unsupported fork: %s", forkName)
} }
if err := json.Unmarshal(data, obj); err != nil { if err := json.Unmarshal(data, obj); err != nil {
return nil, err return nil, err

2
cmd/devp2p/rlpxcmd.go
View File

@ -79,7 +79,7 @@ func rlpxPing(ctx *cli.Context) error {
n := getNodeArg(ctx) n := getNodeArg(ctx)
tcpEndpoint, ok := n.TCPEndpoint() tcpEndpoint, ok := n.TCPEndpoint()
if !ok { if !ok {
return fmt.Errorf("node has no TCP endpoint") return errors.New("node has no TCP endpoint")
} }
fd, err := net.Dial("tcp", tcpEndpoint.String()) fd, err := net.Dial("tcp", tcpEndpoint.String())
if err != nil { if err != nil {

4
p2p/enr/entries.go
View File

@ -177,7 +177,7 @@ func (v IPv4Addr) ENRKey() string { return "ip" }
func (v IPv4Addr) EncodeRLP(w io.Writer) error { func (v IPv4Addr) EncodeRLP(w io.Writer) error {
addr := netip.Addr(v) addr := netip.Addr(v)
if !addr.Is4() { if !addr.Is4() {
return fmt.Errorf("address is not IPv4") return errors.New("address is not IPv4")
} }
enc := rlp.NewEncoderBuffer(w) enc := rlp.NewEncoderBuffer(w)
bytes := addr.As4() bytes := addr.As4()
@ -204,7 +204,7 @@ func (v IPv6Addr) ENRKey() string { return "ip6" }
func (v IPv6Addr) EncodeRLP(w io.Writer) error { func (v IPv6Addr) EncodeRLP(w io.Writer) error {
addr := netip.Addr(v) addr := netip.Addr(v)
if !addr.Is6() { if !addr.Is6() {
return fmt.Errorf("address is not IPv6") return errors.New("address is not IPv6")
} }
enc := rlp.NewEncoderBuffer(w) enc := rlp.NewEncoderBuffer(w)
bytes := addr.As16() bytes := addr.As16()