Merge pull request #3605 from fjl/event-feed

event: add new Subscription type and related utilities
2017-02-03 13:56:00 +02:00
parent 8b57c49490 1bed9b3fea
commit 7734ead520
15 changed files with 1256 additions and 49 deletions
--- 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