diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-23 23:47:05 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-23 23:47:05 +0800 |
| commit | 211cb03f83c8bdfd29af31fd27dc531dfcb13630 (patch) | |
| tree | 7c1296a6194db41a8d8b25a89dd7aa442d6b4fe5 /rpc/args.go | |
| parent | 253ecdc8bba1b522e80fdee69410854f19a5a972 (diff) | |
| parent | 9562a9840f783e6252ebc6fb8da62b81004f62e8 (diff) | |
| download | dexon-211cb03f83c8bdfd29af31fd27dc531dfcb13630.tar dexon-211cb03f83c8bdfd29af31fd27dc531dfcb13630.tar.gz dexon-211cb03f83c8bdfd29af31fd27dc531dfcb13630.tar.bz2 dexon-211cb03f83c8bdfd29af31fd27dc531dfcb13630.tar.lz dexon-211cb03f83c8bdfd29af31fd27dc531dfcb13630.tar.xz dexon-211cb03f83c8bdfd29af31fd27dc531dfcb13630.tar.zst dexon-211cb03f83c8bdfd29af31fd27dc531dfcb13630.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'rpc/args.go')
| -rw-r--r-- | rpc/args.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rpc/args.go b/rpc/args.go index 06dab99bc..6e02b65ef 100644 --- a/rpc/args.go +++ b/rpc/args.go @@ -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 { @@ -26,7 +26,7 @@ func blockAge(raw interface{}, number *int64) (err error) { case "latest": *number = -1 case "pending": - *number = 0 + *number = -2 default: *number = common.String2Big(str).Int64() } @@ -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 } } |