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

refactor: remove errors directive comparison

Browse source
This commit is contained in:
Khanh Hoa 2024-05-11 23:16:14 +07:00
parent 44a50c9f96
commit bd91f367e7
11 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/clef/main.go
View file

@ -923,13 +923,13 @@ func testExternalUI(api *core.SignerAPI) {
} }
} }
expectApprove := func(testcase string, err error) { expectApprove := func(testcase string, err error) {
if err == nil || err == accounts.ErrUnknownAccount { if err == nil || errors.Is(err, accounts.ErrUnknownAccount) {
return return
} }
addErr(fmt.Sprintf("%v: expected no error, got %v", testcase, err.Error())) addErr(fmt.Sprintf("%v: expected no error, got %v", testcase, err.Error()))
} }
expectDeny := func(testcase string, err error) { expectDeny := func(testcase string, err error) {
if err == nil || err != core.ErrRequestDenied { if err == nil || !errors.Is(err, core.ErrRequestDenied) {
addErr(fmt.Sprintf("%v: expected ErrRequestDenied, got %v", testcase, err)) addErr(fmt.Sprintf("%v: expected ErrRequestDenied, got %v", testcase, err))
} }
} }

4
core/blockchain.go
View file

@ -1390,7 +1390,7 @@ func (bc *BlockChain) InsertReceiptChain(blockChain types.Blocks, receiptChain [
// Write downloaded chain data and corresponding receipt chain data // Write downloaded chain data and corresponding receipt chain data
if len(ancientBlocks) > 0 { if len(ancientBlocks) > 0 {
if n, err := writeAncient(ancientBlocks, ancientReceipts); err != nil { if n, err := writeAncient(ancientBlocks, ancientReceipts); err != nil {
if err == errInsertionInterrupted { if errors.Is(err, errInsertionInterrupted) {
return 0, nil return 0, nil
} }
return n, err return n, err
@ -1398,7 +1398,7 @@ func (bc *BlockChain) InsertReceiptChain(blockChain types.Blocks, receiptChain [
} }
if len(liveBlocks) > 0 { if len(liveBlocks) > 0 {
if n, err := writeLive(liveBlocks, liveReceipts); err != nil { if n, err := writeLive(liveBlocks, liveReceipts); err != nil {
if err == errInsertionInterrupted { if errors.Is(err, errInsertionInterrupted) {
return 0, nil return 0, nil
} }
return n, err return n, err

2
core/blockchain_test.go
View file

@ -154,7 +154,7 @@ func testBlockChainImport(chain types.Blocks, blockchain *BlockChain) error {
err = blockchain.validator.ValidateBody(block) err = blockchain.validator.ValidateBody(block)
} }
if err != nil { if err != nil {
if err == ErrKnownBlock { if errors.Is(err, ErrKnownBlock) {
continue continue
} }
return err return err

2
eth/api_admin.go
View file

@ -113,7 +113,7 @@ func (api *AdminAPI) ImportChain(file string) (bool, error) {
// Load a batch of blocks from the input file // Load a batch of blocks from the input file
for len(blocks) < cap(blocks) { for len(blocks) < cap(blocks) {
block := new(types.Block) block := new(types.Block)
if err := stream.Decode(block); err == io.EOF { if err := stream.Decode(block); errors.Is(err, io.EOF) {
break break
} else if err != nil { } else if err != nil {
return false, fmt.Errorf("block %d: failed to parse: %v", index, err) return false, fmt.Errorf("block %d: failed to parse: %v", index, err)

2
node/rpcstack.go
View file

@ -281,7 +281,7 @@ func (h *httpServer) doStop() {
ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout) ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
defer cancel() defer cancel()
err := h.server.Shutdown(ctx) err := h.server.Shutdown(ctx)
if err != nil && err == ctx.Err() { if err != nil && errors.Is(err, ctx.Err()) {
h.log.Warn("HTTP server graceful shutdown timed out") h.log.Warn("HTTP server graceful shutdown timed out")
h.server.Close() h.server.Close()
} }

4
p2p/server_test.go
View file

@ -355,11 +355,11 @@ func TestServerPeerLimits(t *testing.T) {
// Check that server allows a trusted peer despite being full. // Check that server allows a trusted peer despite being full.
conn, _ = net.Pipe() conn, _ = net.Pipe()
srv.SetupConn(conn, flags, dialDest) srv.SetupConn(conn, flags, dialDest)
if tp.closeErr == DiscTooManyPeers { if errors.Is(tp.closeErr, DiscTooManyPeers) {
t.Errorf("failed to bypass MaxPeers with trusted node: %q", tp.closeErr) t.Errorf("failed to bypass MaxPeers with trusted node: %q", tp.closeErr)
} }
if tp.closeErr != DiscUselessPeer { if !errors.Is(tp.closeErr, DiscUselessPeer) {
t.Errorf("unexpected close error: %q", tp.closeErr) t.Errorf("unexpected close error: %q", tp.closeErr)
} }
conn.Close() conn.Close()

12
rlp/decode.go
View file

@ -326,7 +326,7 @@ func decodeSliceElems(s *Stream, val reflect.Value, elemdec decoder) error {
val.SetLen(i + 1) val.SetLen(i + 1)
} }
// decode into element // decode into element
if err := elemdec(s, val.Index(i)); err == EOL { if err := elemdec(s, val.Index(i)); errors.Is(err, EOL) {
break break
} else if err != nil { } else if err != nil {
return addErrorContext(err, fmt.Sprint("[", i, "]")) return addErrorContext(err, fmt.Sprint("[", i, "]"))
@ -345,7 +345,7 @@ func decodeListArray(s *Stream, val reflect.Value, elemdec decoder) error {
vlen := val.Len() vlen := val.Len()
i := 0 i := 0
for ; i < vlen; i++ { for ; i < vlen; i++ {
if err := elemdec(s, val.Index(i)); err == EOL { if err := elemdec(s, val.Index(i)); errors.Is(err, EOL) {
break break
} else if err != nil { } else if err != nil {
return addErrorContext(err, fmt.Sprint("[", i, "]")) return addErrorContext(err, fmt.Sprint("[", i, "]"))
@ -417,7 +417,7 @@ func makeStructDecoder(typ reflect.Type) (decoder, error) {
} }
for i, f := range fields { for i, f := range fields {
err := f.info.decoder(s, val.Field(f.index)) err := f.info.decoder(s, val.Field(f.index))
if err == EOL { if errors.Is(err, EOL) {
if f.optional { if f.optional {
// The field is optional, so reaching the end of the list before // The field is optional, so reaching the end of the list before
// reaching the last field is acceptable. All remaining undecoded // reaching the last field is acceptable. All remaining undecoded
@ -757,7 +757,7 @@ func (s *Stream) uint(maxbits int) (uint64, error) {
} }
v, err := s.readUint(byte(size)) v, err := s.readUint(byte(size))
switch { switch {
case err == ErrCanonSize: case errors.Is(err, ErrCanonSize):
// Adjust error because we're not reading a size right now. // Adjust error because we're not reading a size right now.
return 0, ErrCanonInt return 0, ErrCanonInt
case err != nil: case err != nil:
@ -1129,7 +1129,7 @@ func (s *Stream) readFull(buf []byte) (err error) {
nn, err = s.r.Read(buf[n:]) nn, err = s.r.Read(buf[n:])
n += nn n += nn
} }
if err == io.EOF { if errors.Is(err, io.EOF) {
if n < len(buf) { if n < len(buf) {
err = io.ErrUnexpectedEOF err = io.ErrUnexpectedEOF
} else { } else {
@ -1147,7 +1147,7 @@ func (s *Stream) readByte() (byte, error) {
return 0, err return 0, err
} }
b, err := s.r.ReadByte() b, err := s.r.ReadByte()
if err == io.EOF { if errors.Is(err, io.EOF) {
err = io.ErrUnexpectedEOF err = io.ErrUnexpectedEOF
} }
return b, err return b, err

2
rlp/encode_test.go
View file

@ -476,7 +476,7 @@ func TestEncodeToReaderPiecewise(t *testing.T) {
} }
n, err := r.Read(output[start:end]) n, err := r.Read(output[start:end])
end = start + n end = start + n
if err == io.EOF { if errors.Is(err, io.EOF) {
break break
} else if err != nil { } else if err != nil {
return nil, err return nil, err

2
rpc/json.go
View file

@ -311,7 +311,7 @@ func parsePositionalArguments(rawArgs json.RawMessage, types []reflect.Type) ([]
var args []reflect.Value var args []reflect.Value
tok, err := dec.Token() tok, err := dec.Token()
switch { switch {
case err == io.EOF || tok == nil && err == nil: case errors.Is(err, io.EOF) || tok == nil && err == nil:
// "params" is optional and may be empty. Also allow "params":null even though it's // "params" is optional and may be empty. Also allow "params":null even though it's
// not in the spec because our own client used to send it. // not in the spec because our own client used to send it.
case err != nil: case err != nil:

4
rpc/subscription.go
View file

@ -304,7 +304,7 @@ func (sub *ClientSubscription) run() {
// Send the error. // Send the error.
if err != nil { if err != nil {
if err == ErrClientQuit { if errors.Is(err, ErrClientQuit) {
// ErrClientQuit gets here when Client.Close is called. This is reported as a // ErrClientQuit gets here when Client.Close is called. This is reported as a
// nil error because it's not an error, but we can't close sub.err here. // nil error because it's not an error, but we can't close sub.err here.
err = nil err = nil
@ -340,7 +340,7 @@ func (sub *ClientSubscription) forward() (unsubscribeServer bool, err error) {
if !recv.IsNil() { if !recv.IsNil() {
err = recv.Interface().(error) err = recv.Interface().(error)
} }
if err == errUnsubscribed { if errors.Is(err, errUnsubscribed) {
// Exiting because Unsubscribe was called, unsubscribe on server. // Exiting because Unsubscribe was called, unsubscribe on server.
return true, nil return true, nil
} }

2
rpc/websocket_test.go
View file

@ -159,7 +159,7 @@ func TestWebsocketLargeRead(t *testing.T) {
// Check over limit // Check over limit
if overLimit > 0 { if overLimit > 0 {
err = client.Call(&res, "test_repeat", "A", expLimit+1) err = client.Call(&res, "test_repeat", "A", expLimit+1)
if err == nil || err != websocket.ErrReadLimit { if err == nil || !errors.Is(err, websocket.ErrReadLimit) {
t.Fatalf("wrong error with limit %d: %v expecting %v", expLimit, err, websocket.ErrReadLimit) t.Fatalf("wrong error with limit %d: %v expecting %v", expLimit, err, websocket.ErrReadLimit)
} }
} }