From 12379c697aa72f4ce08733638e6f7e5dcdf3f94f Mon Sep 17 00:00:00 2001
From: Zsolt Felfoldi <zsfelfoldi@gmail.com>
Date: Mon, 23 Jan 2017 02:35:46 +0100
Subject: les: remove delayed les server starting
---
eth/backend.go | 1 -
eth/handler.go | 2 +-
eth/sync.go | 9 +--------
3 files changed, 2 insertions(+), 10 deletions(-)
(limited to 'eth')
diff --git a/eth/backend.go b/eth/backend.go
index e0233db36..af120cbad 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -105,7 +105,6 @@ type Config struct {
type LesServer interface {
Start(srvr *p2p.Server)
- Synced()
Stop()
Protocols() []p2p.Protocol
}
diff --git a/eth/handler.go b/eth/handler.go
index 63ba0821f..e03c89149 100644
--- a/eth/handler.go
+++ b/eth/handler.go
@@ -173,7 +173,7 @@ func NewProtocolManager(config *params.ChainConfig, fastSync bool, networkId int
return blockchain.CurrentBlock().NumberU64()
}
inserter := func(blocks types.Blocks) (int, error) {
- manager.setSynced() // Mark initial sync done on any fetcher import
+ atomic.StoreUint32(&manager.synced, 1) // Mark initial sync done on any fetcher import
return manager.insertChain(blocks)
}
manager.fetcher = fetcher.New(blockchain.GetBlockByHash, validator, manager.BroadcastBlock, heighter, inserter, manager.removePeer)
diff --git a/eth/sync.go b/eth/sync.go
index 234534b4f..373cc2054 100644
--- a/eth/sync.go
+++ b/eth/sync.go
@@ -181,7 +181,7 @@ func (pm *ProtocolManager) synchronise(peer *peer) {
if err := pm.downloader.Synchronise(peer.id, pHead, pTd, mode); err != nil {
return
}
- pm.setSynced() // Mark initial sync done
+ atomic.StoreUint32(&pm.synced, 1) // Mark initial sync done
// If fast sync was enabled, and we synced up, disable it
if atomic.LoadUint32(&pm.fastSync) == 1 {
@@ -192,10 +192,3 @@ func (pm *ProtocolManager) synchronise(peer *peer) {
}
}
}
-
-// setSynced sets the synced flag and notifies the light server if present
-func (pm *ProtocolManager) setSynced() {
- if atomic.SwapUint32(&pm.synced, 1) == 0 && pm.lesServer != nil {
- pm.lesServer.Synced()
- }
-}
--
cgit v1.2.3