mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-21 07:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpc: standardize error codes (#6019)

Browse Source
This commit is contained in:
Bipul Prasad
2021-02-18 17:54:02 +01:00
committed by GitHub
parent 54a14cfeed
commit 90c290ac52
19 changed files with 208 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
light/rpc/client.go
+6 -8
View File
@@ -20,8 +20,6 @@ import (
"github.com/tendermint/tendermint/types"
)
var errNegOrZeroHeight = errors.New("negative or zero height")
// KeyPathFunc builds a merkle path out of the given path and key.
type KeyPathFunc func(path string, key []byte) (merkle.KeyPath, error)
@@ -127,7 +125,7 @@ func (c *Client) ABCIQueryWithOptions(ctx context.Context, path string, data tmb
return nil, errors.New("no proof ops")
}
if resp.Height <= 0 {
return nil, errNegOrZeroHeight
return nil, ctypes.ErrZeroOrNegativeHeight
}
// Update the light client if we're behind.
@@ -212,7 +210,7 @@ func (c *Client) ConsensusParams(ctx context.Context, height *int64) (*ctypes.Re
return nil, err
}
if res.BlockHeight <= 0 {
return nil, errNegOrZeroHeight
return nil, ctypes.ErrZeroOrNegativeHeight
}
// Update the light client if we're behind.
@@ -370,7 +368,7 @@ func (c *Client) BlockResults(ctx context.Context, height *int64) (*ctypes.Resul
// Validate res.
if res.Height <= 0 {
return nil, errNegOrZeroHeight
return nil, ctypes.ErrZeroOrNegativeHeight
}
// Update the light client if we're behind.
@@ -435,7 +433,7 @@ func (c *Client) Tx(ctx context.Context, hash []byte, prove bool) (*ctypes.Resul
// Validate res.
if res.Height <= 0 {
return nil, errNegOrZeroHeight
return nil, ctypes.ErrZeroOrNegativeHeight
}
// Update the light client if we're behind.
@@ -576,7 +574,7 @@ const (
func validatePage(pagePtr *int, perPage, totalCount int) (int, error) {
if perPage < 1 {
panic(fmt.Sprintf("zero or negative perPage: %d", perPage))
panic(fmt.Errorf("%w (%d)", ctypes.ErrZeroOrNegativePerPage, perPage))
}
if pagePtr == nil { // no page parameter
@@ -589,7 +587,7 @@ func validatePage(pagePtr *int, perPage, totalCount int) (int, error) {
}
page := *pagePtr
if page <= 0 || page > pages {
return 1, fmt.Errorf("page should be within [1, %d] range, given %d", pages, page)
return 1, fmt.Errorf("%w expected range: [1, %d], given %d", ctypes.ErrPageOutOfRange, pages, page)
}
return page, nil