Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions pkg/chain/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package chain
import (
"errors"
"fmt"
"strconv"
"strings"
)

Expand Down Expand Up @@ -75,3 +76,20 @@ func ChainFromInt(chainID uint64) (Chain, error) {
}
return "", fmt.Errorf("unknown chain ID: %d", chainID)
}

// ParseChainIDParam parses a chain_id query param. Empty means 0 ("all chains").
// A literal 0 is rejected unless allowZero is true.
func ParseChainIDParam(raw string, allowZero bool) (uint64, error) {
Comment thread
swarna1101 marked this conversation as resolved.
s := strings.TrimSpace(raw)
if s == "" {
return 0, nil
}
id, err := strconv.ParseUint(s, 10, 64)
if err != nil {
return 0, fmt.Errorf("invalid chain_id %q: %w", raw, err)
}
if id == 0 && !allowZero {
return 0, errors.New("chain_id must be a non-zero uint64")
}
return id, nil
}
39 changes: 39 additions & 0 deletions pkg/chain/chain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,42 @@ func TestGenesisTime(t *testing.T) {
_, ok := chain.GenesisTime("unknown")
require.False(t, ok)
}

func TestParseChainIDParam(t *testing.T) {
cases := []struct {
raw string
allowZero bool
want uint64
wantErr bool
}{
{"", false, 0, false},
{" ", false, 0, false},
{"1", false, 1, false},
{" 1 ", false, 1, false},
{"18446744073709551615", false, 18446744073709551615, false},
{"0", false, 0, true},
{"00", false, 0, true},
{"-1", false, 0, true},
{"+1", false, 0, true},
{"abc", false, 0, true},
{"1.0", false, 0, true},
{"18446744073709551616", false, 0, true},
{"", true, 0, false},
{"0", true, 0, false},
{"00", true, 0, false},
{"1", true, 1, false},
{"-1", true, 0, true},
{"abc", true, 0, true},
{"18446744073709551616", true, 0, true},
}
for _, c := range cases {
id, err := chain.ParseChainIDParam(c.raw, c.allowZero)
if c.wantErr {
require.Error(t, err)
require.Equal(t, uint64(0), id)
continue
}
require.NoError(t, err)
require.Equal(t, c.want, id)
}
}
Comment on lines +74 to +111

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same cases, one table. Call ParseChainIDParam(raw, allowZero).

Suggested change
func TestParseChainIDParam(t *testing.T) {
table := map[string]uint64{
"": 0,
"1": 1,
"18446744073709551615": 18446744073709551615,
}
for k, v := range table {
id, err := chain.ParseChainIDParam(k)
require.NoError(t, err)
require.Equal(t, v, id)
}
whitespaceTable := map[string]uint64{
" ": 0,
" 1 ": 1,
}
for k, v := range whitespaceTable {
id, err := chain.ParseChainIDParam(k)
require.NoError(t, err)
require.Equal(t, v, id)
}
invalidCases := []string{
"0",
"00",
"-1",
"+1",
"abc",
"1.0",
"18446744073709551616",
}
for _, i := range invalidCases {
id, err := chain.ParseChainIDParam(i)
require.Error(t, err)
require.Equal(t, uint64(0), id)
}
}
func TestParseChainIDParamAllowZero(t *testing.T) {
table := map[string]uint64{
"": 0,
"0": 0,
"00": 0,
"1": 1,
"18446744073709551615": 18446744073709551615,
}
for k, v := range table {
id, err := chain.ParseChainIDParam(k, chain.AllowZero())
require.NoError(t, err)
require.Equal(t, v, id)
}
whitespaceTable := map[string]uint64{
" ": 0,
" 1 ": 1,
}
for k, v := range whitespaceTable {
id, err := chain.ParseChainIDParam(k, chain.AllowZero())
require.NoError(t, err)
require.Equal(t, v, id)
}
invalidCases := []string{
"-1",
"+1",
"abc",
"1.0",
"18446744073709551616",
}
for _, i := range invalidCases {
id, err := chain.ParseChainIDParam(i, chain.AllowZero())
require.Error(t, err)
require.Equal(t, uint64(0), id)
}
}
func TestParseChainIDParam(t *testing.T) {
cases := []struct {
raw string
allowZero bool
want uint64
wantErr bool
}{
{"", false, 0, false},
{" ", false, 0, false},
{"1", false, 1, false},
{" 1 ", false, 1, false},
{"18446744073709551615", false, 18446744073709551615, false},
{"0", false, 0, true},
{"00", false, 0, true},
{"-1", false, 0, true},
{"+1", false, 0, true},
{"abc", false, 0, true},
{"1.0", false, 0, true},
{"18446744073709551616", false, 0, true},
{"", true, 0, false},
{"0", true, 0, false},
{"00", true, 0, false},
{"1", true, 1, false},
{"-1", true, 0, true},
{"abc", true, 0, true},
{"18446744073709551616", true, 0, true},
}
for _, c := range cases {
id, err := chain.ParseChainIDParam(c.raw, c.allowZero)
if c.wantErr {
require.Error(t, err)
require.Equal(t, uint64(0), id)
continue
}
require.NoError(t, err)
require.Equal(t, c.want, id)
}
}

Loading