forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-13 11:36:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Accept num or hex as index

Browse source
This commit is contained in:
Taylor Gerring 2015-04-22 13:24:10 -05:00
parent 35ad9febce
commit 2ea2261156
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rpc/args.go
View file

@ -535,11 +535,11 @@ func (args *BlockNumIndexArgs) UnmarshalJSON(b []byte) (err error) {
return err return err
} }
arg1, ok := obj[1].(string) var arg1 *big.Int
if !ok { if arg1, err = numString(obj[1]); err != nil {
return NewInvalidTypeError("index", "not a string") return err
} }
args.Index = common.Big(arg1).Int64() args.Index = arg1.Int64()
return nil return nil
} }

2
rpc/args_test.go
View file

@ -2264,7 +2264,7 @@ func TestBlockNumIndexArgsBlocknumInvalid(t *testing.T) {
} }
func TestBlockNumIndexArgsIndexInvalid(t *testing.T) { func TestBlockNumIndexArgsIndexInvalid(t *testing.T) {
input := `["0x29a", 1]` input := `["0x29a", true]`
args := new(BlockNumIndexArgs) args := new(BlockNumIndexArgs)
str := ExpectInvalidTypeError(json.Unmarshal([]byte(input), &args)) str := ExpectInvalidTypeError(json.Unmarshal([]byte(input), &args))