diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-11 03:16:08 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-11 03:16:08 +0800 |
| commit | d9f96293bee9bee16ee6abd9774b385df0b9ad87 (patch) | |
| tree | bee9fc46c70d3bb6cab0dc1528b6736fe6568126 /rpc/args_test.go | |
| parent | f22684439a807f88406e90718e61d536edd469f1 (diff) | |
| parent | 3d6519e45bbd689b75c3ad6966c2044f29c649df (diff) | |
| download | dexon-d9f96293bee9bee16ee6abd9774b385df0b9ad87.tar dexon-d9f96293bee9bee16ee6abd9774b385df0b9ad87.tar.gz dexon-d9f96293bee9bee16ee6abd9774b385df0b9ad87.tar.bz2 dexon-d9f96293bee9bee16ee6abd9774b385df0b9ad87.tar.lz dexon-d9f96293bee9bee16ee6abd9774b385df0b9ad87.tar.xz dexon-d9f96293bee9bee16ee6abd9774b385df0b9ad87.tar.zst dexon-d9f96293bee9bee16ee6abd9774b385df0b9ad87.zip | |
Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into rpcfrontier
Conflicts:
rpc/args.go
Diffstat (limited to 'rpc/args_test.go')
| -rw-r--r-- | rpc/args_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rpc/args_test.go b/rpc/args_test.go index 1e6609b79..ec5400f3f 100644 --- a/rpc/args_test.go +++ b/rpc/args_test.go @@ -243,7 +243,7 @@ func TestFilterOptions(t *testing.T) { expected.Max = 3 expected.Skip = 0 expected.Address = "0xd5677cf67b5aa051bb40496e68ad359eb97cfbf8" - expected.Topic = []string{"0x12341234"} + // expected.Topics = []string{"0x12341234"} args := new(FilterOptions) if err := json.Unmarshal([]byte(input), &args); err != nil { |