From d8f770ae10e7152dd0fe75a38fdc222a5c604f49 Mon Sep 17 00:00:00 2001 From: Julian Yap Date: Tue, 3 Jul 2018 00:10:09 -1000 Subject: [PATCH] Remove unused bad block reporting - more changes --- cmd/gubiq/main.go | 6 ------ eth/handler.go | 19 ++----------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/cmd/gubiq/main.go b/cmd/gubiq/main.go index 0e40dad97e..2c43e5ff48 100644 --- a/cmd/gubiq/main.go +++ b/cmd/gubiq/main.go @@ -159,12 +159,6 @@ func init() { // Start system runtime metrics collection go metrics.CollectProcessMetrics(3 * time.Second) - // This should be the only place where reporting is enabled - // because it is not intended to run while testing. - // In addition to this check, bad block reports are sent only - // for chains with the main network genesis block and network id 1. - eth.EnableBadBlockReporting = true - utils.SetupNetwork(ctx) return nil } diff --git a/eth/handler.go b/eth/handler.go index 14321b0672..e864f796fe 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -88,8 +88,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 @@ -159,7 +157,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(block *types.Block, parent *types.Block) error { @@ -170,26 +168,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 { - glog.V(logger.Debug).Infoln("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)