fix: rename flag names

minhd-vu · minhd-vu · commit f627a6ac8d9d · 2025-10-03T14:09:42.000-04:00
diff --git a/cmd/cdk/cdk.go b/cmd/cdk/cdk.go
@@ -635,7 +635,7 @@ func mustPrintLogs(logs []types.Log, contractInstance reflect.Value, contractABI
 func init() {
 	// cdk
 	f := CDKCmd.PersistentFlags()
-	f.StringVar(&cdkInputArgs.rpcURL, flag.FlagRPCURL, flag.DefaultRPCURL, "RPC URL of network containing CDK contracts")
+	f.StringVar(&cdkInputArgs.rpcURL, flag.RPCURL, flag.DefaultRPCURL, "RPC URL of network containing CDK contracts")
 	f.StringVar(&cdkInputArgs.forkID, ArgForkID, defaultForkId, "fork ID of CDK networks")
 	f.StringVar(&cdkInputArgs.rollupManagerAddress, ArgRollupManagerAddress, "", "address of rollup contract")
 
@@ -677,5 +677,5 @@ func init() {
 	gerCmd.AddCommand(gerMonitorCmd)
 
 	// Mark required flags
-	flag.MarkPersistentFlagRequired(CDKCmd, flag.FlagRPCURL)
+	flag.MarkPersistentFlagRequired(CDKCmd, flag.RPCURL)
 }
diff --git a/cmd/contract/cmd.go b/cmd/contract/cmd.go
@@ -171,10 +171,10 @@ func fetchContractCreationTx(ctx context.Context, client *ethclient.Client, cont
 
 func init() {
 	f := Cmd.Flags()
-	f.StringVar(&inputArgs.rpcURL, flag.FlagRPCURL, flag.DefaultRPCURL, "RPC URL of network containing contract")
+	f.StringVar(&inputArgs.rpcURL, flag.RPCURL, flag.DefaultRPCURL, "RPC URL of network containing contract")
 	f.StringVar(&inputArgs.address, ArgAddress, "", "contract address")
 
 	// Mark required flags
 	flag.MarkFlagRequired(Cmd, ArgAddress)
-	flag.MarkFlagRequired(Cmd, flag.FlagRPCURL)
+	flag.MarkFlagRequired(Cmd, flag.RPCURL)
 }
diff --git a/cmd/dumpblocks/dumpblocks.go b/cmd/dumpblocks/dumpblocks.go
@@ -196,7 +196,7 @@ func init() {
 	f.StringVarP(&inputDumpblocks.FilterStr, "filter", "F", "{}", "filter output based on tx to and from, not setting a filter means all are allowed")
 
 	// Mark required flags
-	flag.MarkFlagRequired(DumpblocksCmd, flag.FlagRPCURL)
+	flag.MarkFlagRequired(DumpblocksCmd, flag.RPCURL)
 }
 
 // writeResponses writes the data to either stdout or a file if one is provided.
diff --git a/cmd/ecrecover/ecrecover.go b/cmd/ecrecover/ecrecover.go
@@ -137,5 +137,5 @@ func init() {
 	EcRecoverCmd.MarkFlagsMutuallyExclusive("file", "block-number", "tx")
 
 	// Mark required flags
-	flag.MarkFlagRequired(EcRecoverCmd, flag.FlagRPCURL)
+	flag.MarkFlagRequired(EcRecoverCmd, flag.RPCURL)
 }
diff --git a/cmd/fixnoncegap/fixnoncegap.go b/cmd/fixnoncegap/fixnoncegap.go
@@ -227,14 +227,14 @@ func fixNonceGap(cmd *cobra.Command, args []string) error {
 
 func init() {
 	f := FixNonceGapCmd.Flags()
-	f.StringVarP(&inputFixNonceGapArgs.rpcURL, flag.FlagRPCURL, "r", "http://localhost:8545", "the RPC endpoint URL")
-	f.StringVar(&inputFixNonceGapArgs.privateKey, flag.FlagPrivateKey, "", "private key to be used when sending txs to fix nonce gap")
+	f.StringVarP(&inputFixNonceGapArgs.rpcURL, flag.RPCURL, "r", "http://localhost:8545", "the RPC endpoint URL")
+	f.StringVar(&inputFixNonceGapArgs.privateKey, flag.PrivateKey, "", "private key to be used when sending txs to fix nonce gap")
 	f.BoolVar(&inputFixNonceGapArgs.replace, ArgReplace, false, "replace the existing txs in the pool")
 	f.Uint64Var(&inputFixNonceGapArgs.maxNonce, ArgMaxNonce, 0, "override max nonce value instead of getting it from the pool")
 
 	// Mark required flags
-	flag.MarkFlagRequired(FixNonceGapCmd, flag.FlagRPCURL)
-	flag.MarkFlagRequired(FixNonceGapCmd, flag.FlagPrivateKey)
+	flag.MarkFlagRequired(FixNonceGapCmd, flag.RPCURL)
+	flag.MarkFlagRequired(FixNonceGapCmd, flag.PrivateKey)
 }
 
 // Wait for the transaction to be mined
diff --git a/cmd/fund/cmd.go b/cmd/fund/cmd.go
@@ -90,8 +90,8 @@ func init() {
 	FundCmd.MarkFlagsOneRequired("addresses", "key-file", "number")
 
 	// Mark required flags
-	flag.MarkFlagRequired(FundCmd, flag.FlagRPCURL)
-	flag.MarkFlagRequired(FundCmd, flag.FlagPrivateKey)
+	flag.MarkFlagRequired(FundCmd, flag.RPCURL)
+	flag.MarkFlagRequired(FundCmd, flag.PrivateKey)
 
 	// Funder contract parameters.
 	f.StringVar(&params.FunderAddress, "contract-address", "", "address of pre-deployed Funder contract")
diff --git a/cmd/loadtest/app.go b/cmd/loadtest/app.go
@@ -304,8 +304,8 @@ v3, uniswapv3 - perform UniswapV3 swaps`)
 	// TODO Compression
 
 	// Mark required flags
-	flag.MarkPersistentFlagRequired(LoadtestCmd, flag.FlagRPCURL)
-	flag.MarkPersistentFlagRequired(LoadtestCmd, flag.FlagPrivateKey)
+	flag.MarkPersistentFlagRequired(LoadtestCmd, flag.RPCURL)
+	flag.MarkPersistentFlagRequired(LoadtestCmd, flag.PrivateKey)
 }
 
 func initSubCommands() {
diff --git a/cmd/monitor/cmd.go b/cmd/monitor/cmd.go
@@ -90,7 +90,7 @@ func init() {
 	f.StringVarP(&intervalStr, "interval", "i", "5s", "amount of time between batch block RPC calls")
 
 	// Mark required flags
-	flag.MarkFlagRequired(MonitorCmd, flag.FlagRPCURL)
+	flag.MarkFlagRequired(MonitorCmd, flag.RPCURL)
 }
 
 func checkFlags() (err error) {
diff --git a/cmd/nodekey/nodekey.go b/cmd/nodekey/nodekey.go
@@ -301,5 +301,5 @@ func init() {
 	f.BoolVarP(&inputNodeKeyMarshalProtobuf, "marshal-protobuf", "m", false, "marshal libp2p key to protobuf format instead of raw")
 
 	// Mark required flags
-	flag.MarkFlagRequired(NodekeyCmd, flag.FlagPrivateKey)
+	flag.MarkFlagRequired(NodekeyCmd, flag.PrivateKey)
 }
diff --git a/cmd/publish/publish.go b/cmd/publish/publish.go
@@ -138,12 +138,12 @@ func publish(cmd *cobra.Command, args []string) error {
 
 func init() {
 	f := Cmd.Flags()
-	f.StringVar(&publishInputArgs.rpcURL, flag.FlagRPCURL, flag.DefaultRPCURL, "RPC URL of network")
+	f.StringVar(&publishInputArgs.rpcURL, flag.RPCURL, flag.DefaultRPCURL, "RPC URL of network")
 	f.Uint64VarP(&publishInputArgs.concurrency, "concurrency", "c", 1, "number of txs to send concurrently (default: one at a time)")
 	f.Uint64Var(&publishInputArgs.jobQueueSize, "job-queue-size", 100, "number of jobs we can put in the job queue for workers to process")
 	f.StringVar(&publishInputArgs.inputFileName, "file", "", "provide a filename with transactions to publish")
 	f.Uint64Var(&publishInputArgs.rateLimit, "rate-limit", 0, "rate limit in txs per second (default: no limit)")
 
 	// Mark required flags
-	flag.MarkFlagRequired(Cmd, flag.FlagRPCURL)
+	flag.MarkFlagRequired(Cmd, flag.RPCURL)
 }
diff --git a/cmd/rpcfuzz/cmd.go b/cmd/rpcfuzz/cmd.go
@@ -86,8 +86,8 @@ func init() {
 	fuzzer.Funcs(argfuzz.FuzzRPCArgs)
 
 	// Mark required flags
-	flag.MarkFlagRequired(RPCFuzzCmd, flag.FlagRPCURL)
-	flag.MarkFlagRequired(RPCFuzzCmd, flag.FlagPrivateKey)
+	flag.MarkFlagRequired(RPCFuzzCmd, flag.RPCURL)
+	flag.MarkFlagRequired(RPCFuzzCmd, flag.PrivateKey)
 }
 
 func checkFlags() (err error) {
diff --git a/cmd/signer/signer.go b/cmd/signer/signer.go
@@ -866,5 +866,5 @@ func init() {
 	f.IntVar(&inputSignerOpts.gcpKeyVersion, "gcp-key-version", 1, "GCP crypto key version to use")
 
 	// Mark required flags
-	flag.MarkFlagRequired(SignerCmd, flag.FlagPrivateKey)
+	flag.MarkFlagRequired(SignerCmd, flag.PrivateKey)
 }
diff --git a/flag/flag.go b/flag/flag.go
@@ -8,10 +8,10 @@ import (
 )
 
 const (
-	// FlagRPCURL is the standard flag name for RPC endpoint URLs.
-	FlagRPCURL = "rpc-url"
-	// FlagPrivateKey is the standard flag name for private keys.
-	FlagPrivateKey = "private-key"
+	// RPCURL is the standard flag name for RPC endpoint URLs.
+	RPCURL = "rpc-url"
+	// PrivateKey is the standard flag name for private keys.
+	PrivateKey = "private-key"
 
 	// DefaultRPCURL is the default RPC endpoint URL.
 	DefaultRPCURL = "http://localhost:8545"
@@ -29,7 +29,7 @@ func GetFlag(cmd *cobra.Command, flagName string) string {
 // GetRPCURL retrieves the rpc-url flag value from Viper after binding it and validates
 // that it is a valid URL with a supported scheme (http, https, ws, wss).
 func GetRPCURL(cmd *cobra.Command) (string, error) {
-	rpcURL := GetFlag(cmd, FlagRPCURL)
+	rpcURL := GetFlag(cmd, RPCURL)
 	if err := util.ValidateUrl(rpcURL); err != nil {
 		return "", err
 	}
@@ -39,7 +39,7 @@ func GetRPCURL(cmd *cobra.Command) (string, error) {
 // GetPrivateKey retrieves the private-key flag value from Viper after binding it.
 // This is a convenience wrapper around GetFlag for the standard private key flag.
 func GetPrivateKey(cmd *cobra.Command) (string, error) {
-	return GetFlag(cmd, FlagPrivateKey), nil
+	return GetFlag(cmd, PrivateKey), nil
 }
 
 // MarkFlagRequired marks a regular flag as required and logs a fatal error if marking fails.

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ func init() {`
`196`	`196`	`f.StringVarP(&inputDumpblocks.FilterStr, "filter", "F", "{}", "filter output based on tx to and from, not setting a filter means all are allowed")`
`197`	`197`
`198`	`198`	`// Mark required flags`
`199`		`- flag.MarkFlagRequired(DumpblocksCmd, flag.FlagRPCURL)`
	`199`	`+ flag.MarkFlagRequired(DumpblocksCmd, flag.RPCURL)`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`// writeResponses writes the data to either stdout or a file if one is provided.`
Original file line number	Diff line number	Diff line change
`@@ -137,5 +137,5 @@ func init() {`
`137`	`137`	`EcRecoverCmd.MarkFlagsMutuallyExclusive("file", "block-number", "tx")`
`138`	`138`
`139`	`139`	`// Mark required flags`
`140`		`- flag.MarkFlagRequired(EcRecoverCmd, flag.FlagRPCURL)`
	`140`	`+ flag.MarkFlagRequired(EcRecoverCmd, flag.RPCURL)`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
@@ -304,8 +304,8 @@ v3, uniswapv3 - perform UniswapV3 swaps`)
`304`	`304`	`// TODO Compression`
`305`	`305`
`306`	`306`	`// Mark required flags`
`307`		`- flag.MarkPersistentFlagRequired(LoadtestCmd, flag.FlagRPCURL)`
`308`		`- flag.MarkPersistentFlagRequired(LoadtestCmd, flag.FlagPrivateKey)`
	`307`	`+ flag.MarkPersistentFlagRequired(LoadtestCmd, flag.RPCURL)`
	`308`	`+ flag.MarkPersistentFlagRequired(LoadtestCmd, flag.PrivateKey)`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`func initSubCommands() {`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func init() {`
`90`	`90`	`f.StringVarP(&intervalStr, "interval", "i", "5s", "amount of time between batch block RPC calls")`
`91`	`91`
`92`	`92`	`// Mark required flags`
`93`		`- flag.MarkFlagRequired(MonitorCmd, flag.FlagRPCURL)`
	`93`	`+ flag.MarkFlagRequired(MonitorCmd, flag.RPCURL)`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`func checkFlags() (err error) {`
Original file line number	Diff line number	Diff line change
`@@ -301,5 +301,5 @@ func init() {`
`301`	`301`	`f.BoolVarP(&inputNodeKeyMarshalProtobuf, "marshal-protobuf", "m", false, "marshal libp2p key to protobuf format instead of raw")`
`302`	`302`
`303`	`303`	`// Mark required flags`
`304`		`- flag.MarkFlagRequired(NodekeyCmd, flag.FlagPrivateKey)`
	`304`	`+ flag.MarkFlagRequired(NodekeyCmd, flag.PrivateKey)`
`305`	`305`	`}`