diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-27 05:27:06 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-27 05:27:06 +0800 |
| commit | 7eed7e1d965ed7194ca42e4637754b63fb4502a5 (patch) | |
| tree | 4cff83e774f4ccdd0c321504784c862b53288582 /rpc/args.go | |
| parent | 2c5a32ebbc60f23e609c8397dad5d09ee38b69bb (diff) | |
| parent | 49a912ce33274f60659ddb3af7e3fec89ee1b59e (diff) | |
| download | dexon-7eed7e1d965ed7194ca42e4637754b63fb4502a5.tar dexon-7eed7e1d965ed7194ca42e4637754b63fb4502a5.tar.gz dexon-7eed7e1d965ed7194ca42e4637754b63fb4502a5.tar.bz2 dexon-7eed7e1d965ed7194ca42e4637754b63fb4502a5.tar.lz dexon-7eed7e1d965ed7194ca42e4637754b63fb4502a5.tar.xz dexon-7eed7e1d965ed7194ca42e4637754b63fb4502a5.tar.zst dexon-7eed7e1d965ed7194ca42e4637754b63fb4502a5.zip | |
Merge branch 'rpcargs' of github.com:tgerring/go-ethereum into rpcargs
Diffstat (limited to 'rpc/args.go')
| -rw-r--r-- | rpc/args.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rpc/args.go b/rpc/args.go index 3637aff66..19258263c 100644 --- a/rpc/args.go +++ b/rpc/args.go @@ -61,7 +61,7 @@ func numString(raw interface{}, number *int64) error { } type GetBlockByHashArgs struct { - BlockHash common.Hash + BlockHash string IncludeTxs bool } @@ -80,7 +80,7 @@ func (args *GetBlockByHashArgs) UnmarshalJSON(b []byte) (err error) { if !ok { return NewInvalidTypeError("blockHash", "not a string") } - args.BlockHash = common.HexToHash(argstr) + args.BlockHash = argstr if len(obj) > 1 { args.IncludeTxs = obj[1].(bool) @@ -360,7 +360,7 @@ func (args *BlockNumIndexArgs) UnmarshalJSON(b []byte) (err error) { } type HashIndexArgs struct { - Hash common.Hash + Hash string Index int64 } @@ -379,7 +379,7 @@ func (args *HashIndexArgs) UnmarshalJSON(b []byte) (err error) { if !ok { return NewInvalidTypeError("hash", "not a string") } - args.Hash = common.HexToHash(arg0) + args.Hash = arg0 if len(obj) > 1 { arg1, ok := obj[1].(string) |