From c33dc3e328c791be8c82b514ba07523f065402e1 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 26 Mar 2015 12:40:09 +0100 Subject: [PATCH] moved helper --- rpc/args.go | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/rpc/args.go b/rpc/args.go index 61331d993b..1928ec218d 100644 --- a/rpc/args.go +++ b/rpc/args.go @@ -36,6 +36,26 @@ func blockHeight(raw interface{}, number *int64) (err error) { return nil } +func toNumber(v interface{}) (int64, error) { + var str string + if v != nil { + var ok bool + str, ok = v.(string) + if !ok { + return 0, errors.New("is not a string or undefined") + } + } else { + str = "latest" + } + + switch str { + case "latest": + return -1, nil + default: + return int64(common.Big(v.(string)).Int64()), nil + } +} + type GetBlockByHashArgs struct { BlockHash string IncludeTxs bool @@ -444,26 +464,6 @@ type BlockFilterArgs struct { Max int } -func toNumber(v interface{}) (int64, error) { - var str string - if v != nil { - var ok bool - str, ok = v.(string) - if !ok { - return 0, errors.New("is not a string or undefined") - } - } else { - str = "latest" - } - - switch str { - case "latest": - return -1, nil - default: - return int64(common.Big(v.(string)).Int64()), nil - } -} - func (args *BlockFilterArgs) UnmarshalJSON(b []byte) (err error) { var obj []struct { FromBlock interface{} `json:"fromBlock"`