Should on empty params #466

This commit is contained in:
Taylor Gerring
2015-03-12 08:42:31 -05:00
parent 21fca93852
commit 4418e4ea6a
2 changed files with 46 additions and 1 deletions

View File

@ -188,10 +188,34 @@ type GetBalanceArgs struct {
}
func (args *GetBalanceArgs) UnmarshalJSON(b []byte) (err error) {
if err = UnmarshalRawMessages(b, &args.Address, &args.BlockNumber); err != nil {
var obj []interface{}
r := bytes.NewReader(b)
if err := json.NewDecoder(r).Decode(&obj); err != nil {
return errDecodeArgs
}
if len(obj) < 1 {
return errArguments
}
addstr, ok := obj[0].(string)
if !ok {
return errDecodeArgs
}
args.Address = addstr
if len(obj) > 1 {
if obj[1].(string) == "latest" {
args.BlockNumber = -1
} else {
args.BlockNumber = ethutil.Big(obj[1].(string)).Int64()
}
}
// if err = UnmarshalRawMessages(b, &args.Address, &args.BlockNumber); err != nil {
// return errDecodeArgs
// }
return nil
}