moved helper

This commit is contained in:
obscuren 2015-03-26 12:40:09 +01:00
parent 83b0cad766
commit c33dc3e328
1 changed files with 20 additions and 20 deletions

View File

@ -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"`