Skip to content

G
Geth-Modification
Commit 968f6019 authored by Corey Lin's avatar Corey Lin Committed by Felix Lange
Browse files
Options

event, event/filter: minor code cleanup (#18061)

parent 503993c8
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
event/event_test.go
View file @ 968f6019
...@@ -141,7 +141,7 @@ func TestMuxConcurrent(t *testing.T) { ...@@ -141,7 +141,7 @@ func TestMuxConcurrent(t *testing.T) {
} }
} }
func emptySubscriber(mux *TypeMux, types ...interface{}) { func emptySubscriber(mux *TypeMux) {
s := mux.Subscribe(testEvent(0)) s := mux.Subscribe(testEvent(0))
go func() { go func() {
for range s.Chan() { for range s.Chan() {
...@@ -182,9 +182,9 @@ func BenchmarkPost1000(b *testing.B) { ...@@ -182,9 +182,9 @@ func BenchmarkPost1000(b *testing.B) {
func BenchmarkPostConcurrent(b *testing.B) { func BenchmarkPostConcurrent(b *testing.B) {
var mux = new(TypeMux) var mux = new(TypeMux)
defer mux.Stop() defer mux.Stop()
emptySubscriber(mux, testEvent(0)) emptySubscriber(mux)
emptySubscriber(mux, testEvent(0)) emptySubscriber(mux)
emptySubscriber(mux, testEvent(0)) emptySubscriber(mux)
var wg sync.WaitGroup var wg sync.WaitGroup
poster := func() { poster := func() {
......
event/filter/generic_filter.go
View file @ 968f6019
...@@ -25,7 +25,7 @@ type Generic struct { ...@@ -25,7 +25,7 @@ type Generic struct {
// self = registered, f = incoming // self = registered, f = incoming
func (self Generic) Compare(f Filter) bool { func (self Generic) Compare(f Filter) bool {
var strMatch, dataMatch = true, true var strMatch = true
filter := f.(Generic) filter := f.(Generic)
if (len(self.Str1) > 0 && filter.Str1 != self.Str1) || if (len(self.Str1) > 0 && filter.Str1 != self.Str1) ||
...@@ -40,7 +40,7 @@ func (self Generic) Compare(f Filter) bool { ...@@ -40,7 +40,7 @@ func (self Generic) Compare(f Filter) bool {
} }
} }
return strMatch && dataMatch return strMatch
} }
func (self Generic) Trigger(data interface{}) { func (self Generic) Trigger(data interface{}) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment