roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Rename blockAge to blockHeight

Browse Source
This commit is contained in:
Taylor Gerring 2015-03-23 16:34:50 +01:00
parent 3f6e1b2fd3
commit 2f8601ef38
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rpc/args.go
View File

@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/common"
)
func blockAge(raw interface{}, number *int64) (err error) {
func blockHeight(raw interface{}, number *int64) (err error) {
// Parse as integer
num, ok := raw.(float64)
if ok {
@ -137,7 +137,7 @@ func (args *NewTxArgs) UnmarshalJSON(b []byte) (err error) {
return NewDecodeParamError(err.Error())
}
if err := blockAge(raw, &args.BlockNumber); err != nil {
if err := blockHeight(raw, &args.BlockNumber); err != nil {
return err
}
}
@ -174,7 +174,7 @@ func (args *GetStorageArgs) UnmarshalJSON(b []byte) (err error) {
args.Address = addstr
if len(obj) > 1 {
if err := blockAge(obj[1], &args.BlockNumber); err != nil {
if err := blockHeight(obj[1], &args.BlockNumber); err != nil {
return err
}
}
@ -218,7 +218,7 @@ func (args *GetStorageAtArgs) UnmarshalJSON(b []byte) (err error) {
args.Key = keystr
if len(obj) > 2 {
if err := blockAge(obj[2], &args.BlockNumber); err != nil {
if err := blockHeight(obj[2], &args.BlockNumber); err != nil {
return err
}
}
@ -259,7 +259,7 @@ func (args *GetTxCountArgs) UnmarshalJSON(b []byte) (err error) {
args.Address = addstr
if len(obj) > 1 {
if err := blockAge(obj[1], &args.BlockNumber); err != nil {
if err := blockHeight(obj[1], &args.BlockNumber); err != nil {
return err
}
}
@ -296,7 +296,7 @@ func (args *GetBalanceArgs) UnmarshalJSON(b []byte) (err error) {
args.Address = addstr
if len(obj) > 1 {
if err := blockAge(obj[1], &args.BlockNumber); err != nil {
if err := blockHeight(obj[1], &args.BlockNumber); err != nil {
return err
}
}
@ -333,7 +333,7 @@ func (args *GetDataArgs) UnmarshalJSON(b []byte) (err error) {
args.Address = addstr
if len(obj) > 1 {
if err := blockAge(obj[1], &args.BlockNumber); err != nil {
if err := blockHeight(obj[1], &args.BlockNumber); err != nil {
return err
}
}