forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 09:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

whisper: changed error text

Browse source
This commit is contained in:
b00ris 2018-02-26 11:18:37 +03:00
parent 0315c19275
commit 1d092fec7c
No known key found for this signature in database
GPG key ID: 2F73E159EB73232C
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
whisper/whisperv5/filter_test.go
View file

@ -797,7 +797,7 @@ func TestTopicsMapping(t *testing.T) {
matched := []string{} matched := []string{}
fs.topicMatcher.matchedTopics(env.Topic, &matched) fs.topicMatcher.matchedTopics(env.Topic, &matched)
if !hasFilterID(matched, filterID) { if !hasFilterID(matched, filterID) {
t.Fatalf("failed MatchEnvelope symmetric with seed %d, step %d.", seed, i) t.Fatalf("failed matchedTopics, step %d.", i)
} }
//test match without filter //test match without filter
@ -807,7 +807,7 @@ func TestTopicsMapping(t *testing.T) {
matched = matched[:0] matched = matched[:0]
fs.topicMatcher.matchedTopics(env.Topic, &matched) fs.topicMatcher.matchedTopics(env.Topic, &matched)
if hasFilterID(matched, filterID) { if hasFilterID(matched, filterID) {
t.Fatalf("failed MatchEnvelope symmetric with seed %d, step %d.", seed, i) t.Fatalf("failed match without filter, step %d.", i)
} }
//test match with changed topic //test match with changed topic
@ -819,7 +819,7 @@ func TestTopicsMapping(t *testing.T) {
matched = matched[:0] matched = matched[:0]
fs.topicMatcher.matchedTopics(env.Topic, &matched) fs.topicMatcher.matchedTopics(env.Topic, &matched)
if hasFilterID(matched, filterID) { if hasFilterID(matched, filterID) {
t.Fatalf("failed MatchEnvelope symmetric with seed %d, step %d.", seed, i) t.Fatalf("failed match with changed topic, step %d.", i)
} }
if !fs.Uninstall(filterID) { if !fs.Uninstall(filterID) {
t.Fatal("Failed to uninstall filter") t.Fatal("Failed to uninstall filter")
@ -850,7 +850,7 @@ func TestTopicsMapping_MatchAllTopics_Success(t *testing.T) {
matched := []string{} matched := []string{}
fs.topicMatcher.matchedTopics(topic, &matched) fs.topicMatcher.matchedTopics(topic, &matched)
if !hasFilterID(matched, filterID) { if !hasFilterID(matched, filterID) {
t.Fatalf("failed MatchEnvelope symmetric with seed %d, step %d.", seed) t.Fatal("failed matchedTopics")
} }
if _, ok := fs.topicMatcher.mapper[ALL_TOPICS][filterID]; !ok { if _, ok := fs.topicMatcher.mapper[ALL_TOPICS][filterID]; !ok {
t.Fatal("watcher mapping incorrect") t.Fatal("watcher mapping incorrect")
@ -863,7 +863,7 @@ func TestTopicsMapping_MatchAllTopics_Success(t *testing.T) {
matched = matched[:0] matched = matched[:0]
fs.topicMatcher.matchedTopics(topic, &matched) fs.topicMatcher.matchedTopics(topic, &matched)
if hasFilterID(matched, filterID) { if hasFilterID(matched, filterID) {
t.Fatalf("failed MatchEnvelope symmetric with seed %d, step %d.", seed) t.Fatal("failed match without filter")
} }
if _, ok := fs.topicMatcher.mapper[ALL_TOPICS][filterID]; ok { if _, ok := fs.topicMatcher.mapper[ALL_TOPICS][filterID]; ok {
@ -925,7 +925,7 @@ func benchFilter_MatchMessage(b *testing.B, numOfFilters int) {
_, err = fs.Install(f) _, err = fs.Install(f)
if err != nil { if err != nil {
b.Fatalf("failed generateFilter with seed %d: %s.", seed, err) b.Fatalf("failed install filter with seed %d: %s.", seed, err)
} }
} }

12
whisper/whisperv6/filter_test.go
View file

@ -844,7 +844,7 @@ func TestTopicsMapping(t *testing.T) {
matched := []string{} matched := []string{}
fs.topicMatcher.matchedTopics(env.Topic, &matched) fs.topicMatcher.matchedTopics(env.Topic, &matched)
if !hasFilterID(matched, filterID) { if !hasFilterID(matched, filterID) {
t.Fatalf("failed MatchEnvelope symmetric with seed %d, step %d.", seed, i) t.Fatalf("failed matchedTopics, step %d.", seed, i)
} }
//test match without filter //test match without filter
@ -854,7 +854,7 @@ func TestTopicsMapping(t *testing.T) {
matched = matched[:0] matched = matched[:0]
fs.topicMatcher.matchedTopics(env.Topic, &matched) fs.topicMatcher.matchedTopics(env.Topic, &matched)
if hasFilterID(matched, filterID) { if hasFilterID(matched, filterID) {
t.Fatalf("failed MatchEnvelope symmetric with seed %d, step %d.", seed, i) t.Fatalf("failed match without filter, step %d.", i)
} }
//test match with changed topic //test match with changed topic
@ -866,7 +866,7 @@ func TestTopicsMapping(t *testing.T) {
matched = matched[:0] matched = matched[:0]
fs.topicMatcher.matchedTopics(env.Topic, &matched) fs.topicMatcher.matchedTopics(env.Topic, &matched)
if hasFilterID(matched, filterID) { if hasFilterID(matched, filterID) {
t.Fatalf("failed MatchEnvelope symmetric with seed %d, step %d.", seed, i) t.Fatalf("failed match with changed topic, step %d.", i)
} }
if !fs.Uninstall(filterID) { if !fs.Uninstall(filterID) {
t.Fatal("Failed to uninstall filter") t.Fatal("Failed to uninstall filter")
@ -897,7 +897,7 @@ func TestTopicsMapping_MatchAllTopics_Success(t *testing.T) {
matched := []string{} matched := []string{}
fs.topicMatcher.matchedTopics(topic, &matched) fs.topicMatcher.matchedTopics(topic, &matched)
if !hasFilterID(matched, filterID) { if !hasFilterID(matched, filterID) {
t.Fatalf("failed MatchEnvelope symmetric with seed %d, step %d.", seed) t.Fatal("failed matchedTopics")
} }
if _, ok := fs.topicMatcher.mapper[ALL_TOPICS][filterID]; !ok { if _, ok := fs.topicMatcher.mapper[ALL_TOPICS][filterID]; !ok {
t.Fatal("watcher mapping incorrect") t.Fatal("watcher mapping incorrect")
@ -910,7 +910,7 @@ func TestTopicsMapping_MatchAllTopics_Success(t *testing.T) {
matched = matched[:0] matched = matched[:0]
fs.topicMatcher.matchedTopics(topic, &matched) fs.topicMatcher.matchedTopics(topic, &matched)
if hasFilterID(matched, filterID) { if hasFilterID(matched, filterID) {
t.Fatalf("failed MatchEnvelope symmetric with seed %d, step %d.", seed) t.Fatal("failed match without filter")
} }
if _, ok := fs.topicMatcher.mapper[ALL_TOPICS][filterID]; ok { if _, ok := fs.topicMatcher.mapper[ALL_TOPICS][filterID]; ok {
@ -972,7 +972,7 @@ func benchFilter_MatchMessage(b *testing.B, numOfFilters int) {
_, err = fs.Install(f) _, err = fs.Install(f)
if err != nil { if err != nil {
b.Fatalf("failed generateFilter with seed %d: %s.", seed, err) b.Fatalf("failed install filter with seed %d: %s.", seed, err)
} }
} }