diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-02-03 19:56:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 19:56:00 +0800 |
| commit | 7734ead52030a6c128613331ea4a24afd9d4173a (patch) | |
| tree | 7bed2d0085c7a9cac97691ccf561976119f45c78 /eth | |
| parent | 8b57c494908637a5c0e74f8f7a13b3218e026757 (diff) | |
| parent | 1bed9b3fea9939581b03cae9d6b4984ced456748 (diff) | |
| download | dexon-7734ead52030a6c128613331ea4a24afd9d4173a.tar.gz dexon-7734ead52030a6c128613331ea4a24afd9d4173a.tar.zst dexon-7734ead52030a6c128613331ea4a24afd9d4173a.zip | |
Merge pull request #3605 from fjl/event-feed
event: add new Subscription type and related utilities
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/filters/filter_system.go | 4 | ||||
| -rw-r--r-- | eth/handler.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index e0ee2ff51..3adf8111a 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -74,7 +74,7 @@ type subscription struct { // subscription which match the subscription criteria. type EventSystem struct { mux *event.TypeMux - sub event.Subscription + sub *event.TypeMuxSubscription backend Backend lightMode bool lastHead *types.Header @@ -277,7 +277,7 @@ func (es *EventSystem) SubscribePendingTxEvents(hashes chan common.Hash) *Subscr type filterIndex map[Type]map[rpc.ID]*subscription // broadcast event to filters that match criteria. -func (es *EventSystem) broadcast(filters filterIndex, ev *event.Event) { +func (es *EventSystem) broadcast(filters filterIndex, ev *event.TypeMuxEvent) { if ev == nil { return } diff --git a/eth/handler.go b/eth/handler.go index e03c89149..0e7eed352 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -78,8 +78,8 @@ type ProtocolManager struct { SubProtocols []p2p.Protocol eventMux *event.TypeMux - txSub event.Subscription - minedBlockSub event.Subscription + txSub *event.TypeMuxSubscription + minedBlockSub *event.TypeMuxSubscription // channels for fetcher, syncer, txsyncLoop newPeerCh chan *peer |