diff --git a/execution/gethexec/blockmetadata.go b/execution/gethexec/blockmetadata.go index e2b0f56db6..7605861ffe 100644 --- a/execution/gethexec/blockmetadata.go +++ b/execution/gethexec/blockmetadata.go @@ -20,7 +20,7 @@ type BlockMetadataFetcher interface { BlockMetadataAtCount(count arbutil.MessageIndex) (arbostypes.BlockMetadata, error) BlockNumberToMessageIndex(blockNum uint64) (arbutil.MessageIndex, error) MessageIndexToBlockNumber(messageNum arbutil.MessageIndex) uint64 - SetReorgEventsReader(reorgEventsReader chan struct{}) + SetReorgEventsNotifier(reorgEventsNotifier chan struct{}) } type BulkBlockMetadataFetcher struct { @@ -38,7 +38,7 @@ func NewBulkBlockMetadataFetcher(bc *core.BlockChain, fetcher BlockMetadataFetch if cacheSize != 0 { cache = lru.NewSizeConstrainedCache[arbutil.MessageIndex, arbostypes.BlockMetadata](cacheSize) reorgDetector = make(chan struct{}) - fetcher.SetReorgEventsReader(reorgDetector) + fetcher.SetReorgEventsNotifier(reorgDetector) } return &BulkBlockMetadataFetcher{ bc: bc, diff --git a/execution/gethexec/executionengine.go b/execution/gethexec/executionengine.go index 87a8b510aa..126d5ad1b2 100644 --- a/execution/gethexec/executionengine.go +++ b/execution/gethexec/executionengine.go @@ -80,10 +80,10 @@ type ExecutionEngine struct { resequenceChan chan []*arbostypes.MessageWithMetadata createBlocksMutex sync.Mutex - newBlockNotifier chan struct{} - reorgEventsReader chan struct{} - latestBlockMutex sync.Mutex - latestBlock *types.Block + newBlockNotifier chan struct{} + reorgEventsNotifier chan struct{} + latestBlockMutex sync.Mutex + latestBlock *types.Block nextScheduledVersionCheck time.Time // protected by the createBlocksMutex @@ -135,8 +135,8 @@ func (s *ExecutionEngine) backlogL1GasCharged() uint64 { s.cachedL1PriceData.msgToL1PriceData[0].l1GasCharged) } -func (s *ExecutionEngine) SetReorgEventsReader(reorgEventsReader chan struct{}) { - s.reorgEventsReader = reorgEventsReader +func (s *ExecutionEngine) SetReorgEventsNotifier(reorgEventsNotifier chan struct{}) { + s.reorgEventsNotifier = reorgEventsNotifier } func (s *ExecutionEngine) MarkFeedStart(to arbutil.MessageIndex) { @@ -258,9 +258,9 @@ func (s *ExecutionEngine) Reorg(count arbutil.MessageIndex, newMessages []arbost return nil, err } - if s.reorgEventsReader != nil { + if s.reorgEventsNotifier != nil { select { - case s.reorgEventsReader <- struct{}{}: + case s.reorgEventsNotifier <- struct{}{}: default: } }