aboutsummaryrefslogtreecommitdiffstats
path: root/eth/handler.go
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-04-06 19:25:05 +0800
committerPéter Szilágyi <peterke@gmail.com>2017-04-06 19:25:05 +0800
commit702bef8493f0f3486072f1a7593fa582a1fb53d0 (patch)
treef813e349e371f79e2b6a5b65f0657354c1bb3dd2 /eth/handler.go
parentd83a9a8f4429176fc6cc7974c08ce988c879a6bf (diff)
downloaddexon-702bef8493f0f3486072f1a7593fa582a1fb53d0.tar
dexon-702bef8493f0f3486072f1a7593fa582a1fb53d0.tar.gz
dexon-702bef8493f0f3486072f1a7593fa582a1fb53d0.tar.bz2
dexon-702bef8493f0f3486072f1a7593fa582a1fb53d0.tar.lz
dexon-702bef8493f0f3486072f1a7593fa582a1fb53d0.tar.xz
dexon-702bef8493f0f3486072f1a7593fa582a1fb53d0.tar.zst
dexon-702bef8493f0f3486072f1a7593fa582a1fb53d0.zip
cmd/geth, eth: drop bad block reporting, its offline anyway
Diffstat (limited to 'eth/handler.go')
-rw-r--r--eth/handler.go19
1 files changed, 2 insertions, 17 deletions
diff --git a/eth/handler.go b/eth/handler.go
index 445272060..ef62a3d65 100644
--- a/eth/handler.go
+++ b/eth/handler.go
@@ -92,8 +92,6 @@ type ProtocolManager struct {
// wait group is used for graceful shutdowns during downloading
// and processing
wg sync.WaitGroup
-
- badBlockReportingEnabled bool
}
// NewProtocolManager returns a new ethereum sub protocol manager. The Ethereum sub protocol manages peers capable
@@ -163,7 +161,7 @@ func NewProtocolManager(config *params.ChainConfig, fastSync bool, networkId int
// Construct the different synchronisation mechanisms
manager.downloader = downloader.New(downloader.FullSync, chaindb, manager.eventMux, blockchain.HasHeader, blockchain.HasBlockAndState, blockchain.GetHeaderByHash,
blockchain.GetBlockByHash, blockchain.CurrentHeader, blockchain.CurrentBlock, blockchain.CurrentFastBlock, blockchain.FastSyncCommitHead,
- blockchain.GetTdByHash, blockchain.InsertHeaderChain, manager.insertChain, blockchain.InsertReceiptChain, blockchain.Rollback,
+ blockchain.GetTdByHash, blockchain.InsertHeaderChain, manager.blockchain.InsertChain, blockchain.InsertReceiptChain, blockchain.Rollback,
manager.removePeer)
validator := func(header *types.Header) error {
@@ -174,26 +172,13 @@ func NewProtocolManager(config *params.ChainConfig, fastSync bool, networkId int
}
inserter := func(blocks types.Blocks) (int, error) {
atomic.StoreUint32(&manager.synced, 1) // Mark initial sync done on any fetcher import
- return manager.insertChain(blocks)
+ return manager.blockchain.InsertChain(blocks)
}
manager.fetcher = fetcher.New(blockchain.GetBlockByHash, validator, manager.BroadcastBlock, heighter, inserter, manager.removePeer)
- if blockchain.Genesis().Hash().Hex() == defaultGenesisHash && networkId == 1 {
- log.Debug("Bad block reporting is enabled")
- manager.badBlockReportingEnabled = true
- }
-
return manager, nil
}
-func (pm *ProtocolManager) insertChain(blocks types.Blocks) (i int, err error) {
- i, err = pm.blockchain.InsertChain(blocks)
- if pm.badBlockReportingEnabled && core.IsValidationErr(err) && i < len(blocks) {
- go sendBadBlockReport(blocks[i], err)
- }
- return i, err
-}
-
func (pm *ProtocolManager) removePeer(id string) {
// Short circuit if the peer was already removed
peer := pm.peers.Peer(id)