Skip to content

Commit 408d76d

Browse files
committed
simplify constructor
1 parent 6890d32 commit 408d76d

File tree

7 files changed

+8
-15
lines changed

7 files changed

+8
-15
lines changed

apps/evm/cmd/run.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func createSequencer(
169169
return nil, fmt.Errorf("based sequencer mode requires aggregator mode to be enabled")
170170
}
171171

172-
basedSeq, err := based.NewBasedSequencer(ctx, fiRetriever, da, datastore, nodeConfig, genesis, logger)
172+
basedSeq, err := based.NewBasedSequencer(ctx, fiRetriever, da, datastore, genesis, logger)
173173
if err != nil {
174174
return nil, fmt.Errorf("failed to create based sequencer: %w", err)
175175
}

apps/grpc/cmd/run.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func createSequencer(
131131
return nil, fmt.Errorf("based sequencer mode requires aggregator mode to be enabled")
132132
}
133133

134-
basedSeq, err := based.NewBasedSequencer(ctx, fiRetriever, da, datastore, nodeConfig, genesis, logger)
134+
basedSeq, err := based.NewBasedSequencer(ctx, fiRetriever, da, datastore, genesis, logger)
135135
if err != nil {
136136
return nil, fmt.Errorf("failed to create based sequencer: %w", err)
137137
}

apps/testapp/cmd/run.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func createSequencer(
131131
return nil, fmt.Errorf("based sequencer mode requires aggregator mode to be enabled")
132132
}
133133

134-
basedSeq, err := based.NewBasedSequencer(ctx, fiRetriever, da, datastore, nodeConfig, genesis, logger)
134+
basedSeq, err := based.NewBasedSequencer(ctx, fiRetriever, da, datastore, genesis, logger)
135135
if err != nil {
136136
return nil, fmt.Errorf("failed to create based sequencer: %w", err)
137137
}

sequencers/based/sequencer.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/evstack/ev-node/block"
1414
coreda "github.com/evstack/ev-node/core/da"
1515
coresequencer "github.com/evstack/ev-node/core/sequencer"
16-
"github.com/evstack/ev-node/pkg/config"
1716
"github.com/evstack/ev-node/pkg/genesis"
1817
seqcommon "github.com/evstack/ev-node/sequencers/common"
1918
)
@@ -31,7 +30,6 @@ var _ coresequencer.Sequencer = (*BasedSequencer)(nil)
3130
type BasedSequencer struct {
3231
fiRetriever ForcedInclusionRetriever
3332
da coreda.DA
34-
config config.Config
3533
genesis genesis.Genesis
3634
logger zerolog.Logger
3735

@@ -49,14 +47,12 @@ func NewBasedSequencer(
4947
fiRetriever ForcedInclusionRetriever,
5048
da coreda.DA,
5149
db ds.Batching,
52-
config config.Config,
5350
genesis genesis.Genesis,
5451
logger zerolog.Logger,
5552
) (*BasedSequencer, error) {
5653
bs := &BasedSequencer{
5754
fiRetriever: fiRetriever,
5855
da: da,
59-
config: config,
6056
genesis: genesis,
6157
logger: logger.With().Str("component", "based_sequencer").Logger(),
6258
checkpointStore: seqcommon.NewCheckpointStore(db, ds.NewKey("/based/checkpoint")),

sequencers/based/sequencer_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func createTestSequencer(t *testing.T, mockDA *MockDA, cfg config.Config, gen ge
9090
// Create in-memory datastore
9191
db := syncds.MutexWrap(ds.NewMapDatastore())
9292

93-
seq, err := NewBasedSequencer(context.Background(), fiRetriever, mockDA, db, cfg, gen, zerolog.Nop())
93+
seq, err := NewBasedSequencer(context.Background(), fiRetriever, mockDA, db, gen, zerolog.Nop())
9494
require.NoError(t, err)
9595
return seq
9696
}
@@ -223,7 +223,7 @@ func TestBasedSequencer_GetNextBatch_NotConfigured(t *testing.T) {
223223
// Create in-memory datastore
224224
db := syncds.MutexWrap(ds.NewMapDatastore())
225225

226-
seq, err := NewBasedSequencer(context.Background(), fiRetriever, mockDA, db, cfg, gen, zerolog.Nop())
226+
seq, err := NewBasedSequencer(context.Background(), fiRetriever, mockDA, db, gen, zerolog.Nop())
227227
require.NoError(t, err)
228228

229229
req := coresequencer.GetNextBatchRequest{
@@ -580,7 +580,7 @@ func TestBasedSequencer_CheckpointPersistence(t *testing.T) {
580580
daClient := block.NewDAClient(mockDA, cfg, zerolog.Nop())
581581
fiRetriever := block.NewForcedInclusionRetriever(daClient, gen, zerolog.Nop())
582582

583-
seq1, err := NewBasedSequencer(context.Background(), fiRetriever, mockDA, db, cfg, gen, zerolog.Nop())
583+
seq1, err := NewBasedSequencer(context.Background(), fiRetriever, mockDA, db, gen, zerolog.Nop())
584584
require.NoError(t, err)
585585

586586
req := coresequencer.GetNextBatchRequest{
@@ -595,7 +595,7 @@ func TestBasedSequencer_CheckpointPersistence(t *testing.T) {
595595
assert.Equal(t, 2, len(resp.Batch.Transactions))
596596

597597
// Create a new sequencer with the same datastore (simulating restart)
598-
seq2, err := NewBasedSequencer(context.Background(), fiRetriever, mockDA, db, cfg, gen, zerolog.Nop())
598+
seq2, err := NewBasedSequencer(context.Background(), fiRetriever, mockDA, db, gen, zerolog.Nop())
599599
require.NoError(t, err)
600600

601601
// Checkpoint should be loaded from DB

sequencers/single/doc.go

Lines changed: 0 additions & 4 deletions
This file was deleted.

sequencers/single/sequencer.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// Package single implements a single sequencer.
12
package single
23

34
import (

0 commit comments

Comments
 (0)