From 12e8d9c4dd03e02c507e7174c5a5288e2292a674 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sat, 18 Apr 2015 02:27:37 +0200
Subject: eth: listen for mined blocks and propagate using the protocol manager

---
 eth/backend.go | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

(limited to 'eth')

diff --git a/eth/backend.go b/eth/backend.go
index 923cdfa5d..07552ad5a 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -136,11 +136,11 @@ type Ethereum struct {
 	protocolManager *ProtocolManager
 	downloader      *downloader.Downloader
 
-	net      *p2p.Server
-	eventMux *event.TypeMux
-	txSub    event.Subscription
-	//blockSub event.Subscription
-	miner *miner.Miner
+	net           *p2p.Server
+	eventMux      *event.TypeMux
+	txSub         event.Subscription
+	minedBlockSub event.Subscription
+	miner         *miner.Miner
 
 	// logger logger.LogSystem
 
@@ -387,8 +387,8 @@ func (s *Ethereum) Start() error {
 	go s.txBroadcastLoop()
 
 	// broadcast mined blocks
-	//s.blockSub = s.eventMux.Subscribe(core.ChainHeadEvent{})
-	go s.blockBroadcastLoop()
+	s.minedBlockSub = s.eventMux.Subscribe(core.NewMinedBlockEvent{})
+	go s.minedBroadcastLoop()
 
 	glog.V(logger.Info).Infoln("Server started")
 	return nil
@@ -419,8 +419,8 @@ func (s *Ethereum) Stop() {
 	defer s.stateDb.Close()
 	defer s.extraDb.Close()
 
-	s.txSub.Unsubscribe() // quits txBroadcastLoop
-	//s.blockSub.Unsubscribe() // quits blockBroadcastLoop
+	s.txSub.Unsubscribe()         // quits txBroadcastLoop
+	s.minedBlockSub.Unsubscribe() // quits blockBroadcastLoop
 
 	s.txPool.Stop()
 	s.eventMux.Stop()
@@ -462,16 +462,14 @@ func (self *Ethereum) syncAccounts(tx *types.Transaction) {
 	}
 }
 
-func (self *Ethereum) blockBroadcastLoop() {
+func (self *Ethereum) minedBroadcastLoop() {
 	// automatically stops if unsubscribe
-	/*
-		for obj := range self.blockSub.Chan() {
-			switch ev := obj.(type) {
-			case core.ChainHeadEvent:
-				self.net.BroadcastLimited("eth", NewBlockMsg, math.Sqrt, []interface{}{ev.Block, ev.Block.Td})
-			}
+	for obj := range self.minedBlockSub.Chan() {
+		switch ev := obj.(type) {
+		case core.NewMinedBlockEvent:
+			self.protocolManager.BroadcastBlock(ev.Block)
 		}
-	*/
+	}
 }
 
 func saveProtocolVersion(db common.Database, protov int) {
-- 
cgit v1.2.3