From c6ad3aec05e1c42c3e4a222d1e8306598d5254f3 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 1 May 2015 16:30:02 +0200
Subject: [PATCH] eth,core: changed NewTicker to Tick

---
 core/chain_manager.go | 4 ++--
 eth/sync.go           | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/chain_manager.go b/core/chain_manager.go
index e172c5cdb..4dfa67b8d 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -669,7 +669,7 @@ func (self *ChainManager) merge(oldBlock, newBlock *types.Block) {
 
 func (self *ChainManager) update() {
 	events := self.eventMux.Subscribe(queueEvent{})
-	futureTimer := time.NewTicker(5 * time.Second)
+	futureTimer := time.Tick(5 * time.Second)
 out:
 	for {
 		select {
@@ -696,7 +696,7 @@ out:
 					self.eventMux.Post(event)
 				}
 			}
-		case <-futureTimer.C:
+		case <-futureTimer:
 			self.procFutureBlocks()
 		case <-self.quit:
 			break out
diff --git a/eth/sync.go b/eth/sync.go
index bcf4b231f..16d85d1f1 100644
--- a/eth/sync.go
+++ b/eth/sync.go
@@ -15,8 +15,8 @@ func (pm *ProtocolManager) update() {
 	// itimer is used to determine when to start ignoring `minDesiredPeerCount`
 	itimer := time.NewTimer(peerCountTimeout)
 	// btimer is used for picking of blocks from the downloader
-	btimer := time.NewTicker(blockProcTimer)
-out:
+	btimer := time.Tick(blockProcTimer)
+
 	for {
 		select {
 		case <-pm.newPeerCh:
@@ -43,10 +43,10 @@ out:
 			} else {
 				itimer.Reset(5 * time.Second)
 			}
-		case <-btimer.C:
+		case <-btimer:
 			go pm.processBlocks()
 		case <-pm.quitSync:
-			break out
+			return
 		}
 	}
 }