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 /whisper/whisper_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 'whisper/whisper_test.go')
| -rw-r--r-- | whisper/whisper_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/whisper/whisper_test.go b/whisper/whisper_test.go index def8e68d8..7c5067f51 100644 --- a/whisper/whisper_test.go +++ b/whisper/whisper_test.go @@ -129,7 +129,7 @@ func testBroadcast(anonymous bool, t *testing.T) { dones[i] = done targets[i].Watch(Filter{ - Topics: NewTopicsFromStrings("broadcast topic"), + Topics: NewFilterTopicsFromStringsFlat("broadcast topic"), Fn: func(msg *Message) { close(done) }, |