diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-28 17:17:41 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-28 17:17:41 +0800 |
| commit | 99027c79fe7406919d654ab482d8ad37fcf098ce (patch) | |
| tree | 9f6625b30b9d63d28f7e86c69d31991daac4fbf7 /rpc/args_test.go | |
| parent | bac455c0117f7095ee9c60ac75a249ddd66c2660 (diff) | |
| parent | a05c420371aa56657b86ba3dce6ebb087adb708d (diff) | |
| download | go-tangerine-99027c79fe7406919d654ab482d8ad37fcf098ce.tar go-tangerine-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.gz go-tangerine-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.bz2 go-tangerine-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.lz go-tangerine-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.xz go-tangerine-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.zst go-tangerine-99027c79fe7406919d654ab482d8ad37fcf098ce.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
rpc/api.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 2f011bfd9..f5949b7a2 100644 --- a/rpc/args_test.go +++ b/rpc/args_test.go @@ -1943,7 +1943,7 @@ func TestWhisperFilterArgs(t *testing.T) { input := `[{"topics": ["0x68656c6c6f20776f726c64"], "to": "0x34ag445g3455b34"}]` expected := new(WhisperFilterArgs) expected.To = "0x34ag445g3455b34" - expected.Topics = []string{"0x68656c6c6f20776f726c64"} + expected.Topics = [][]string{[]string{"0x68656c6c6f20776f726c64"}} args := new(WhisperFilterArgs) if err := json.Unmarshal([]byte(input), &args); err != nil { |