Merge pull request #14364 from fjl/core-remove-split-stat-ty
core, light: delete SplitStatTy, ChainSplitEvent (unused)
This commit is contained in:
		| @@ -628,7 +628,6 @@ type WriteStatus byte | ||||
| const ( | ||||
| 	NonStatTy WriteStatus = iota | ||||
| 	CanonStatTy | ||||
| 	SplitStatTy | ||||
| 	SideStatTy | ||||
| ) | ||||
|  | ||||
| @@ -1029,9 +1028,6 @@ func (self *BlockChain) InsertChain(chain types.Blocks) (int, error) { | ||||
|  | ||||
| 			blockInsertTimer.UpdateSince(bstart) | ||||
| 			events = append(events, ChainSideEvent{block}) | ||||
|  | ||||
| 		case SplitStatTy: | ||||
| 			events = append(events, ChainSplitEvent{block, logs}) | ||||
| 		} | ||||
| 		stats.processed++ | ||||
| 		stats.usedGas += usedGas.Uint64() | ||||
| @@ -1226,8 +1222,9 @@ func (self *BlockChain) postChainEvents(events []interface{}, logs []*types.Log) | ||||
| 	self.eventMux.Post(logs) | ||||
| 	for _, event := range events { | ||||
| 		if event, ok := event.(ChainEvent); ok { | ||||
| 			// We need some control over the mining operation. Acquiring locks and waiting for the miner to create new block takes too long | ||||
| 			// and in most cases isn't even necessary. | ||||
| 			// We need some control over the mining operation. Acquiring locks and waiting | ||||
| 			// for the miner to create new block takes too long and in most cases isn't | ||||
| 			// even necessary. | ||||
| 			if self.LastBlockHash() == event.Hash { | ||||
| 				self.eventMux.Post(ChainHeadEvent{event.Block}) | ||||
| 			} | ||||
|   | ||||
| @@ -46,12 +46,6 @@ type RemovedTransactionEvent struct{ Txs types.Transactions } | ||||
| // RemovedLogEvent is posted when a reorg happens | ||||
| type RemovedLogsEvent struct{ Logs []*types.Log } | ||||
|  | ||||
| // ChainSplit is posted when a new head is detected | ||||
| type ChainSplitEvent struct { | ||||
| 	Block *types.Block | ||||
| 	Logs  []*types.Log | ||||
| } | ||||
|  | ||||
| type ChainEvent struct { | ||||
| 	Block *types.Block | ||||
| 	Hash  common.Hash | ||||
|   | ||||
| @@ -377,9 +377,6 @@ func (self *LightChain) InsertHeaderChain(chain []*types.Header, checkFreq int) | ||||
| 		case core.SideStatTy: | ||||
| 			log.Debug("Inserted forked header", "number", header.Number, "hash", header.Hash()) | ||||
| 			events = append(events, core.ChainSideEvent{Block: types.NewBlockWithHeader(header)}) | ||||
|  | ||||
| 		case core.SplitStatTy: | ||||
| 			events = append(events, core.ChainSplitEvent{Block: types.NewBlockWithHeader(header)}) | ||||
| 		} | ||||
| 		return err | ||||
| 	} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user