cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Use new bloom when filtering for topics

Browse Source
This commit is contained in:
obscuren 2014-10-29 20:33:25 +01:00
parent cc67a84e94
commit 2ef044edfc
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethchain/bloom9_test.go
View File

@ -8,7 +8,7 @@ import (
func TestBloom9(t *testing.T) { func TestBloom9(t *testing.T) {
testCase := []byte("testtest") 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) res := BloomLookup(bin, testCase)
if !res { if !res {

7
ethchain/filter.go
View File

@ -170,13 +170,10 @@ func (self *Filter) FilterMessages(msgs []*ethstate.Message) []*ethstate.Message
} }
func (self *Filter) bloomFilter(block *Block) bool { func (self *Filter) bloomFilter(block *Block) bool {
// TODO update to the new bloom filter
bloom := NewBloomFilter(nil)
var fromIncluded, toIncluded bool var fromIncluded, toIncluded bool
if len(self.from) > 0 { if len(self.from) > 0 {
for _, from := range self.from { for _, from := range self.from {
if bloom.Search(from) { if BloomLookup(block.LogsBloom, from) {
fromIncluded = true fromIncluded = true
break break
} }
@ -187,7 +184,7 @@ func (self *Filter) bloomFilter(block *Block) bool {
if len(self.to) > 0 { if len(self.to) > 0 {
for _, to := range self.to { for _, to := range self.to {
if bloom.Search(to) { if BloomLookup(block.LogsBloom, to) {
toIncluded = true toIncluded = true
break break
} }