Skip to content

Commit

Permalink
Merge pull request #6164 from pengin7384/resettable_typo
Browse files Browse the repository at this point in the history
fix: typo
  • Loading branch information
OptimismBot authored Jul 2, 2023
2 parents b7fd37e + c110390 commit d80c145
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 7 deletions.
10 changes: 10 additions & 0 deletions .changeset/little-scissors-own.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
'@eth-optimism/contracts-periphery': patch
'@eth-optimism/contracts-bedrock': patch
'@eth-optimism/fault-detector': patch
'@eth-optimism/core-utils': patch
'@eth-optimism/endpoint-monitor': patch
'@eth-optimism/sdk': patch
---

fix typo
2 changes: 1 addition & 1 deletion op-node/rollup/derive/channel_bank.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type ChannelBank struct {
fetcher L1Fetcher
}

var _ ResetableStage = (*ChannelBank)(nil)
var _ ResettableStage = (*ChannelBank)(nil)

// NewChannelBank creates a ChannelBank, which should be Reset(origin) before use.
func NewChannelBank(log log.Logger, cfg *rollup.Config, prev NextFrameProvider, fetcher L1Fetcher) *ChannelBank {
Expand Down
2 changes: 1 addition & 1 deletion op-node/rollup/derive/channel_in_reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type ChannelInReader struct {
metrics Metrics
}

var _ ResetableStage = (*ChannelInReader)(nil)
var _ ResettableStage = (*ChannelInReader)(nil)

// NewChannelInReader creates a ChannelInReader, which should be Reset(origin) before use.
func NewChannelInReader(log log.Logger, prev *ChannelBank, metrics Metrics) *ChannelInReader {
Expand Down
2 changes: 1 addition & 1 deletion op-node/rollup/derive/l1_retrieval.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type L1Retrieval struct {
datas DataIter
}

var _ ResetableStage = (*L1Retrieval)(nil)
var _ ResettableStage = (*L1Retrieval)(nil)

func NewL1Retrieval(log log.Logger, dataSrc DataAvailabilitySource, prev NextBlockProvider) *L1Retrieval {
return &L1Retrieval{
Expand Down
2 changes: 1 addition & 1 deletion op-node/rollup/derive/l1_traversal.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ type L1Traversal struct {
cfg *rollup.Config
}

var _ ResetableStage = (*L1Traversal)(nil)
var _ ResettableStage = (*L1Traversal)(nil)

func NewL1Traversal(log log.Logger, cfg *rollup.Config, l1Blocks L1BlockRefByNumberFetcher) *L1Traversal {
return &L1Traversal{
Expand Down
6 changes: 3 additions & 3 deletions op-node/rollup/derive/pipeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ type ResettableEngineControl interface {
Reset()
}

type ResetableStage interface {
type ResettableStage interface {
// Reset resets a pull stage. `base` refers to the L1 Block Reference to reset to, with corresponding configuration.
Reset(ctx context.Context, base eth.L1BlockRef, baseCfg eth.SystemConfig) error
}
Expand Down Expand Up @@ -65,7 +65,7 @@ type DerivationPipeline struct {
// Index of the stage that is currently being reset.
// >= len(stages) if no additional resetting is required
resetting int
stages []ResetableStage
stages []ResettableStage

// Special stages to keep track of
traversal *L1Traversal
Expand Down Expand Up @@ -94,7 +94,7 @@ func NewDerivationPipeline(log log.Logger, cfg *rollup.Config, l1Fetcher L1Fetch
// Reset from engine queue then up from L1 Traversal. The stages do not talk to each other during
// the reset, but after the engine queue, this is the order in which the stages could talk to each other.
// Note: The engine queue stage is the only reset that can fail.
stages := []ResetableStage{eng, l1Traversal, l1Src, frameQueue, bank, chInReader, batchQueue, attributesQueue}
stages := []ResettableStage{eng, l1Traversal, l1Src, frameQueue, bank, chInReader, batchQueue, attributesQueue}

return &DerivationPipeline{
log: log,
Expand Down

0 comments on commit d80c145

Please sign in to comment.