tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Corey Lin 2018-11-08 19:17:01 +08:00 committed by Felix Lange
parent 503993c819
commit 968f6019d0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
event/event_test.go
View File

@ -141,7 +141,7 @@ func TestMuxConcurrent(t *testing.T) {
}
}
func emptySubscriber(mux *TypeMux, types ...interface{}) {
func emptySubscriber(mux *TypeMux) {
s := mux.Subscribe(testEvent(0))
go func() {
for range s.Chan() {
@ -182,9 +182,9 @@ func BenchmarkPost1000(b *testing.B) {
func BenchmarkPostConcurrent(b *testing.B) {
var mux = new(TypeMux)
defer mux.Stop()
emptySubscriber(mux, testEvent(0))
emptySubscriber(mux, testEvent(0))
emptySubscriber(mux, testEvent(0))
emptySubscriber(mux)
emptySubscriber(mux)
emptySubscriber(mux)
var wg sync.WaitGroup
poster := func() {

4
event/filter/generic_filter.go
View File

@ -25,7 +25,7 @@ type Generic struct {
// self = registered, f = incoming
func (self Generic) Compare(f Filter) bool {
var strMatch, dataMatch = true, true
var strMatch = true
filter := f.(Generic)
if (len(self.Str1) > 0 && filter.Str1 != self.Str1) ||
@ -40,7 +40,7 @@ func (self Generic) Compare(f Filter) bool {
}
}
return strMatch && dataMatch
return strMatch
}
func (self Generic) Trigger(data interface{}) {