This commit is contained in:
Taylor Gerring 2015-03-26 22:58:12 +01:00
parent 6bd1f6cc49
commit 3fcef54f9b
2 changed files with 15 additions and 9 deletions

View File

@ -29,7 +29,7 @@ func blockHeight(raw interface{}, number *int64) error {
// Parse as string/hexstring
str, ok := raw.(string)
if !ok {
return NewInvalidTypeError("blockNumber", "not a number or string")
return NewInvalidTypeError("", "not a number or string")
}
switch str {
@ -82,6 +82,17 @@ func numString(raw interface{}, number *int64) error {
// }
// }
// func hashString(raw interface{}, hash *string) error {
// argstr, ok := raw.(string)
// if !ok {
// return NewInvalidTypeError("", "not a string")
// }
// v := common.IsHex(argstr)
// hash = &argstr
// return nil
// }
type GetBlockByHashArgs struct {
BlockHash string
IncludeTxs bool

View File

@ -155,14 +155,9 @@ func TestGetBalanceArgsInvalid(t *testing.T) {
input := `6`
args := new(GetBalanceArgs)
err := json.Unmarshal([]byte(input), &args)
switch err.(type) {
case nil:
t.Error("Expected error but didn't get one")
case *DecodeParamError:
break
default:
t.Errorf("Expected *rpc.DecodeParamError but got %T with message %s", err, err.Error())
str := ExpectDecodeParamError(json.Unmarshal([]byte(input), &args))
if len(str) > 0 {
t.Error(str)
}
}