From 2ef044edfca1afcb0e3185f32d5e4c7cce72153a Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 29 Oct 2014 20:33:25 +0100
Subject: [PATCH] Use new bloom when filtering for topics

---
 ethchain/bloom9_test.go | 2 +-
 ethchain/filter.go      | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ethchain/bloom9_test.go b/ethchain/bloom9_test.go
index ab648b7fc..40f30f35d 100644
--- a/ethchain/bloom9_test.go
+++ b/ethchain/bloom9_test.go
@@ -8,7 +8,7 @@ import (
 
 func TestBloom9(t *testing.T) {
 	testCase := []byte("testtest")
-	bin := LogsBloom([]vm.Log{vm.Log{testCase, nil, nil}}).Bytes()
+	bin := LogsBloom([]vm.Log{vm.Log{testCase, [][]byte{[]byte("hellohello")}, nil}}).Bytes()
 	res := BloomLookup(bin, testCase)
 
 	if !res {
diff --git a/ethchain/filter.go b/ethchain/filter.go
index 55d7072e2..b0edea7a0 100644
--- a/ethchain/filter.go
+++ b/ethchain/filter.go
@@ -170,13 +170,10 @@ func (self *Filter) FilterMessages(msgs []*ethstate.Message) []*ethstate.Message
 }
 
 func (self *Filter) bloomFilter(block *Block) bool {
-	// TODO update to the new bloom filter
-	bloom := NewBloomFilter(nil)
-
 	var fromIncluded, toIncluded bool
 	if len(self.from) > 0 {
 		for _, from := range self.from {
-			if bloom.Search(from) {
+			if BloomLookup(block.LogsBloom, from) {
 				fromIncluded = true
 				break
 			}
@@ -187,7 +184,7 @@ func (self *Filter) bloomFilter(block *Block) bool {
 
 	if len(self.to) > 0 {
 		for _, to := range self.to {
-			if bloom.Search(to) {
+			if BloomLookup(block.LogsBloom, to) {
 				toIncluded = true
 				break
 			}