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

Merge remote-tracking branch 'origin' into rpcargs

Browse Source 
Conflicts:
	rpc/args.go
This commit is contained in:
Taylor Gerring
2015-03-26 22:42:46 +01:00
parent bb12dbe233 b0b0939879
commit 6bd1f6cc49
25 changed files with 397 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
rpc/args.go
View File

@ -3,6 +3,8 @@ package rpc
import (
"bytes"
"encoding/json"
// "errors"
// "fmt"
"math/big"
"github.com/ethereum/go-ethereum/common"
@ -60,6 +62,26 @@ func numString(raw interface{}, number *int64) 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
@ -442,6 +464,14 @@ func (args *BlockFilterArgs) UnmarshalJSON(b []byte) (err error) {
return NewInsufficientParamsError(len(obj), 1)
}
// args.Earliest, err = toNumber(obj[0].ToBlock)
// if err != nil {
// return NewDecodeParamError(fmt.Sprintf("FromBlock %v", err))
// }
// args.Latest, err = toNumber(obj[0].FromBlock)
// if err != nil {
// return NewDecodeParamError(fmt.Sprintf("ToBlock %v", err))
var num int64
if err := blockHeight(obj[0].FromBlock, &num); err != nil {
return err
@ -464,6 +494,7 @@ func (args *BlockFilterArgs) UnmarshalJSON(b []byte) (err error) {
if err := numString(obj[0].Offset, &num); err != nil {
return err
}
args.Skip = int(num)