diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-21 05:47:27 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-21 05:47:27 +0800 |
| commit | 81800ca39ea03da7f63d8ecfbd74773f4ca73323 (patch) | |
| tree | 6d56577858304d970c7754bcd5ac24c2b282f079 /event | |
| parent | b95ff54632d9a31286f5b629556071b6043d274a (diff) | |
| parent | f4e9638867f5dab01eeb6db5fdbd85737a11fbd6 (diff) | |
| download | dexon-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar dexon-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.gz dexon-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.bz2 dexon-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.lz dexon-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.xz dexon-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.zst dexon-81800ca39ea03da7f63d8ecfbd74773f4ca73323.zip | |
Merge remote-tracking branch 'ethereum/conversion' into conversion
Diffstat (limited to 'event')
| -rw-r--r-- | event/filter/eth_filter.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/event/filter/eth_filter.go b/event/filter/eth_filter.go index cb75d7e1a..1abd48389 100644 --- a/event/filter/eth_filter.go +++ b/event/filter/eth_filter.go @@ -48,7 +48,9 @@ func (self *FilterManager) InstallFilter(filter *core.Filter) (id int) { func (self *FilterManager) UninstallFilter(id int) { self.filterMu.Lock() defer self.filterMu.Unlock() - delete(self.filters, id) + if _, ok := self.filters[id]; ok { + delete(self.filters, id) + } } // GetFilter retrieves a filter installed using InstallFilter. @@ -62,8 +64,9 @@ func (self *FilterManager) GetFilter(id int) *core.Filter { func (self *FilterManager) filterLoop() { // Subscribe to events events := self.eventMux.Subscribe( - core.PendingBlockEvent{}, + //core.PendingBlockEvent{}, core.ChainEvent{}, + core.TxPreEvent{}, state.Logs(nil)) out: @@ -82,11 +85,11 @@ out: } self.filterMu.RUnlock() - case core.PendingBlockEvent: + case core.TxPreEvent: self.filterMu.RLock() for _, filter := range self.filters { if filter.PendingCallback != nil { - filter.PendingCallback(event.Block, event.Logs) + filter.PendingCallback(event.Tx) } } self.filterMu.RUnlock() |