Skip to content

Commit 483e042

Browse files
tac0turtletac0turtle
andauthored
chore: move based flags (#2247)
<!-- Please read and fill out this form before submitting your PR. Please make sure you have reviewed our contributors guide before submitting your first PR. NOTE: PR titles should follow semantic commits: https://www.conventionalcommits.org/en/v1.0.0/ --> ## Overview This pr moves based flags from strings to constants in order to be able to reuse htem <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Refactor** - Improved maintainability by standardizing the use of flag name constants for configuration options in the "based" subsystem. - Error messages and namespace handling now dynamically reference flag names, enhancing consistency and clarity. <!-- end of auto-generated comment: release notes by coderabbit.ai --> Co-authored-by: tac0turtle <you@example.com>
1 parent d7a052f commit 483e042

2 files changed

Lines changed: 33 additions & 22 deletions

File tree

rollups/evm/based/cmd/run.go

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -63,33 +63,33 @@ func NewExtendedRunNodeCmd(ctx context.Context) *cobra.Command {
6363
return fmt.Errorf("failed to get 'evm.fee-recipient' flag: %w", err)
6464
}
6565

66-
basedURL, err = cmd.Flags().GetString("based.url")
66+
basedURL, err = cmd.Flags().GetString(based.FlagBasedURL)
6767
if err != nil {
68-
return fmt.Errorf("failed to get 'based.url' flag: %w", err)
68+
return fmt.Errorf("failed to get '%s' flag: %w", based.FlagBasedURL, err)
6969
}
70-
basedAuth, err = cmd.Flags().GetString("based.auth")
70+
basedAuth, err = cmd.Flags().GetString(based.FlagBasedAuth)
7171
if err != nil {
72-
return fmt.Errorf("failed to get 'based.auth' flag: %w", err)
72+
return fmt.Errorf("failed to get '%s' flag: %w", based.FlagBasedAuth, err)
7373
}
74-
basedNamespace, err = cmd.Flags().GetString("based.namespace")
74+
basedNamespace, err = cmd.Flags().GetString(based.FlagBasedNamespace)
7575
if err != nil {
76-
return fmt.Errorf("failed to get 'based.namespace' flag: %w", err)
76+
return fmt.Errorf("failed to get '%s' flag: %w", based.FlagBasedNamespace, err)
7777
}
78-
basedStartHeight, err = cmd.Flags().GetUint64("based.start-height")
78+
basedStartHeight, err = cmd.Flags().GetUint64(based.FlagBasedStartHeight)
7979
if err != nil {
80-
return fmt.Errorf("failed to get 'based.start-height' flag: %w", err)
80+
return fmt.Errorf("failed to get '%s' flag: %w", based.FlagBasedStartHeight, err)
8181
}
82-
basedMaxHeightDrift, err = cmd.Flags().GetUint64("based.max-height-drift")
82+
basedMaxHeightDrift, err = cmd.Flags().GetUint64(based.FlagBasedMaxHeightDrift)
8383
if err != nil {
84-
return fmt.Errorf("failed to get 'based.max-height-drift' flag: %w", err)
84+
return fmt.Errorf("failed to get '%s' flag: %w", based.FlagBasedMaxHeightDrift, err)
8585
}
86-
basedGasMultiplier, err = cmd.Flags().GetFloat64("based.gas-multiplier")
86+
basedGasMultiplier, err = cmd.Flags().GetFloat64(based.FlagBasedGasMultiplier)
8787
if err != nil {
88-
return fmt.Errorf("failed to get 'based.gas-multiplier' flag: %w", err)
88+
return fmt.Errorf("failed to get '%s' flag: %w", based.FlagBasedGasMultiplier, err)
8989
}
90-
basedGasPrice, err = cmd.Flags().GetFloat64("based.gas-price")
90+
basedGasPrice, err = cmd.Flags().GetFloat64(based.FlagBasedGasPrice)
9191
if err != nil {
92-
return fmt.Errorf("failed to get 'based.gas-price' flag: %w", err)
92+
return fmt.Errorf("failed to get '%s' flag: %w", based.FlagBasedGasPrice, err)
9393
}
9494
return nil
9595
},
@@ -140,7 +140,7 @@ func NewExtendedRunNodeCmd(ctx context.Context) *cobra.Command {
140140
sequencer, err := based.NewSequencer(
141141
logger,
142142
basedDA,
143-
[]byte("rollkit-test"),
143+
[]byte(basedNamespace), // Use the namespace from the flag
144144
basedStartHeight,
145145
basedMaxHeightDrift,
146146
datastore,
@@ -181,13 +181,13 @@ func NewExtendedRunNodeCmd(ctx context.Context) *cobra.Command {
181181
cmd.Flags().StringVar(&jwtSecret, "evm.jwt-secret", "", "JWT secret for Engine API")
182182
cmd.Flags().StringVar(&genesisHash, "evm.genesis-hash", "", "Genesis block hash")
183183
cmd.Flags().StringVar(&feeRecipient, "evm.fee-recipient", "", "Fee recipient address")
184-
cmd.Flags().StringVar(&basedURL, "based.url", "http://localhost:26658", "Based API URL")
185-
cmd.Flags().StringVar(&basedAuth, "based.auth", "", "Authentication token for Based API")
186-
cmd.Flags().StringVar(&basedNamespace, "based.namespace", "", "Namespace for Based API")
187-
cmd.Flags().Uint64Var(&basedStartHeight, "based.start-height", 0, "Starting height for Based API")
188-
cmd.Flags().Uint64Var(&basedMaxHeightDrift, "based.max-height-drift", 1, "Maximum L1 block height drift")
189-
cmd.Flags().Float64Var(&basedGasMultiplier, "based.gas-multiplier", 1.0, "Gas multiplier for Based API")
190-
cmd.Flags().Float64Var(&basedGasPrice, "based.gas-price", -1.0, "Gas price for Based API")
184+
cmd.Flags().StringVar(&basedURL, based.FlagBasedURL, "http://localhost:26658", "Based API URL")
185+
cmd.Flags().StringVar(&basedAuth, based.FlagBasedAuth, "", "Authentication token for Based API")
186+
cmd.Flags().StringVar(&basedNamespace, based.FlagBasedNamespace, "", "Namespace for Based API")
187+
cmd.Flags().Uint64Var(&basedStartHeight, based.FlagBasedStartHeight, 0, "Starting height for Based API")
188+
cmd.Flags().Uint64Var(&basedMaxHeightDrift, based.FlagBasedMaxHeightDrift, 1, "Maximum L1 block height drift")
189+
cmd.Flags().Float64Var(&basedGasMultiplier, based.FlagBasedGasMultiplier, 1.0, "Gas multiplier for Based API")
190+
cmd.Flags().Float64Var(&basedGasPrice, based.FlagBasedGasPrice, -1.0, "Gas price for Based API")
191191

192192
return cmd
193193
}

sequencers/based/flags.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package based
2+
3+
const (
4+
FlagBasedURL = "based.url"
5+
FlagBasedAuth = "based.auth"
6+
FlagBasedNamespace = "based.namespace"
7+
FlagBasedStartHeight = "based.start-height"
8+
FlagBasedMaxHeightDrift = "based.max-height-drift"
9+
FlagBasedGasMultiplier = "based.gas-multiplier"
10+
FlagBasedGasPrice = "based.gas-price"
11+
)

0 commit comments

Comments
 (0)