Merge pull request #1751 from maran/fix_filters

fjl · fjl · commit 1ffc5b0cfdf0 · 2015-09-01T20:10:27.000+02:00
core: Filter on addresses should work as an OR not an AND.
diff --git a/core/filter.go b/core/filter.go
@@ -131,12 +131,12 @@ done:
 
 func includes(addresses []common.Address, a common.Address) bool {
 	for _, addr := range addresses {
-		if addr != a {
-			return false
+		if addr == a {
+			return true
 		}
 	}
 
-	return true
+	return false
 }
 
 func (self *Filter) FilterLogs(logs state.Logs) state.Logs {

Original file line number	Diff line number	Diff line change
`@@ -131,12 +131,12 @@ done:`
`131`	`131`
`132`	`132`	`func includes(addresses []common.Address, a common.Address) bool {`
`133`	`133`	`for _, addr := range addresses {`
`134`		`- if addr != a {`
`135`		`- return false`
	`134`	`+ if addr == a {`
	`135`	`+ return true`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`139`		`- return true`
	`139`	`+ return false`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`func (self *Filter) FilterLogs(logs state.Logs) state.Logs {`