gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into rpcfrontier

Browse Source 
Conflicts:
	rpc/args.go
This commit is contained in:
obscuren
2015-03-10 20:16:08 +01:00
parent f22684439a 3d6519e45b
commit d9f96293be
5 changed files with 318 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rpc/args.go
View File

@ -3,7 +3,6 @@ package rpc
import (
"bytes"
"encoding/json"
"fmt"
"math/big"
"github.com/ethereum/go-ethereum/ethutil"
@ -65,7 +64,12 @@ func (args *GetBlockByNumberArgs) UnmarshalJSON(b []byte) (err error) {
if len(obj) < 1 {
return errArguments
}
args.BlockNumber = ethutil.Big(obj[0].(string)).Int64()
if v, ok := obj[0].(float64); ok {
args.BlockNumber = int64(v)
} else {
args.BlockNumber = ethutil.Big(obj[0].(string)).Int64()
}
if len(obj) > 1 {
args.Transactions = obj[1].(bool)
@ -110,7 +114,6 @@ func (args *GetStorageArgs) UnmarshalJSON(b []byte) (err error) {
if err = UnmarshalRawMessages(b, &args.Address, &args.BlockNumber); err != nil {
return errDecodeArgs
}
fmt.Println(args)
return nil
}
@ -140,8 +143,6 @@ func (args *GetStorageAtArgs) UnmarshalJSON(b []byte) (err error) {
args.Address = obj[0]
args.Key = obj[1]
fmt.Println(args)
return nil
}