Skip to content
This repository has been archived by the owner on Apr 15, 2024. It is now read-only.

chore: replace string with constant in homeDir #329

Merged
merged 4 commits into from
Apr 28, 2023
Merged

chore: replace string with constant in homeDir #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22aa7ff
chore: replace string with constant in homeDir
DeepYV Apr 27, 2023
e7f34c2
chore : replace service-name homeDir string with constant
DeepYV Apr 27, 2023
546f52b
chore : replace service-name deployer homeDir string with constant
DeepYV Apr 27, 2023
1c76039
chore : replace service-name deployer in cmd homeDir string with cons…
DeepYV Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/qgb/deploy/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func Command() *cobra.Command {
return nil
},
}
command.AddCommand(keys.Command("deployer"))
command.AddCommand(keys.Command(ServiceNameDeployer))
return addDeployFlags(command)
}

Expand Down
17 changes: 9 additions & 8 deletions cmd/qgb/deploy/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ import (
)

const (
FlagEVMAccAddress = "evm-address"
FlagEVMChainID = "evm-chain-id"
FlagCelesGRPC = "celes-grpc"
FlagEVMRPC = "evm-rpc"
FlagStartingNonce = "starting-nonce"
FlagEVMGasLimit = "evm-gas-limit"
FlagEVMAccAddress = "evm-address"
FlagEVMChainID = "evm-chain-id"
FlagCelesGRPC = "celes-grpc"
FlagEVMRPC = "evm-rpc"
FlagStartingNonce = "starting-nonce"
FlagEVMGasLimit = "evm-gas-limit"
ServiceNameDeployer = "deployer"
)

func addDeployFlags(cmd *cobra.Command) *cobra.Command {
Expand All @@ -33,7 +34,7 @@ func addDeployFlags(cmd *cobra.Command) *cobra.Command {
"\"nonce\": for the latest valset before the provided nonce, provided nonce included.",
)
cmd.Flags().Uint64P(FlagEVMGasLimit, "l", evm.DefaultEVMGasLimit, "Specify the evm gas limit")
homeDir, err := base.DefaultServicePath("deployer")
homeDir, err := base.DefaultServicePath(ServiceNameDeployer)
if err != nil {
panic(err)
}
Expand Down Expand Up @@ -86,7 +87,7 @@ func parseDeployFlags(cmd *cobra.Command) (deployConfig, error) {
}
if homeDir == "" {
var err error
homeDir, err = base.DefaultServicePath("deployer")
homeDir, err = base.DefaultServicePath(ServiceNameDeployer)
if err != nil {
return deployConfig{}, err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/qgb/orchestrator/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func Command() *cobra.Command {
orchCmd.AddCommand(
Start(),
Init(),
keys.Command("orchestrator"),
keys.Command(ServiceNameOrchestrator),
)

orchCmd.SetHelpCommand(&cobra.Command{})
Expand Down
21 changes: 11 additions & 10 deletions cmd/qgb/orchestrator/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ import (
)

const (
FlagCelestiaGRPC = "celes-grpc"
FlagEVMAccAddress = "evm-address"
FlagTendermintRPC = "celes-rpc"
FlagBootstrappers = "p2p-bootstrappers"
FlagP2PListenAddress = "p2p-listen-addr"
FlagP2PNickname = "p2p-nickname"
FlagCelestiaGRPC = "celes-grpc"
FlagEVMAccAddress = "evm-address"
FlagTendermintRPC = "celes-rpc"
FlagBootstrappers = "p2p-bootstrappers"
FlagP2PListenAddress = "p2p-listen-addr"
FlagP2PNickname = "p2p-nickname"
ServiceNameOrchestrator = "orchestrator"
)

func addOrchestratorFlags(cmd *cobra.Command) *cobra.Command {
Expand All @@ -29,7 +30,7 @@ func addOrchestratorFlags(cmd *cobra.Command) *cobra.Command {
cmd.Flags().StringP(FlagBootstrappers, "b", "", "Comma-separated multiaddresses of p2p peers to connect to")
cmd.Flags().StringP(FlagP2PNickname, "p", "", "Nickname of the p2p private key to use (if not provided, an existing one from the p2p store or a newly generated one will be used)")
cmd.Flags().StringP(FlagP2PListenAddress, "q", "/ip4/0.0.0.0/tcp/30000", "MultiAddr for the p2p peer to listen on")
homeDir, err := base.DefaultServicePath("orchestrator")
homeDir, err := base.DefaultServicePath(ServiceNameOrchestrator)
if err != nil {
panic(err)
}
Expand Down Expand Up @@ -81,7 +82,7 @@ func parseOrchestratorFlags(cmd *cobra.Command) (StartConfig, error) {
}
if homeDir == "" {
var err error
homeDir, err = base.DefaultServicePath("orchestrator")
homeDir, err = base.DefaultServicePath(ServiceNameOrchestrator)
if err != nil {
return StartConfig{}, err
}
Expand All @@ -106,7 +107,7 @@ func parseOrchestratorFlags(cmd *cobra.Command) (StartConfig, error) {
}

func addInitFlags(cmd *cobra.Command) *cobra.Command {
homeDir, err := base.DefaultServicePath("orchestrator")
homeDir, err := base.DefaultServicePath(ServiceNameOrchestrator)
if err != nil {
panic(err)
}
Expand All @@ -125,7 +126,7 @@ func parseInitFlags(cmd *cobra.Command) (InitConfig, error) {
}
if homeDir == "" {
var err error
homeDir, err = base.DefaultServicePath("orchestrator")
homeDir, err = base.DefaultServicePath(ServiceNameOrchestrator)
if err != nil {
return InitConfig{}, err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/qgb/relayer/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func Command() *cobra.Command {
relCmd.AddCommand(
Start(),
Init(),
keys.Command("relayer"),
keys.Command(ServiceNameRelayer),
)

relCmd.SetHelpCommand(&cobra.Command{})
Expand Down
9 changes: 5 additions & 4 deletions cmd/qgb/relayer/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const (
FlagBootstrappers = "p2p-bootstrappers"
FlagP2PListenAddress = "p2p-listen-addr"
FlagP2PNickname = "p2p-nickname"
ServiceNameRelayer = "relayer"
)

func addRelayerStartFlags(cmd *cobra.Command) *cobra.Command {
Expand All @@ -38,7 +39,7 @@ func addRelayerStartFlags(cmd *cobra.Command) *cobra.Command {
cmd.Flags().StringP(FlagBootstrappers, "b", "", "Comma-separated multiaddresses of p2p peers to connect to")
cmd.Flags().StringP(FlagP2PNickname, "p", "", "Nickname of the p2p private key to use (if not provided, an existing one from the p2p store or a newly generated one will be used)")
cmd.Flags().StringP(FlagP2PListenAddress, "q", "/ip4/127.0.0.1/tcp/30000", "MultiAddr for the p2p peer to listen on")
homeDir, err := base.DefaultServicePath("relayer")
homeDir, err := base.DefaultServicePath(ServiceNameRelayer)
if err != nil {
panic(err)
}
Expand Down Expand Up @@ -116,7 +117,7 @@ func parseRelayerStartFlags(cmd *cobra.Command) (StartConfig, error) {
}
if homeDir == "" {
var err error
homeDir, err = base.DefaultServicePath("relayer")
homeDir, err = base.DefaultServicePath(ServiceNameRelayer)
if err != nil {
return StartConfig{}, err
}
Expand Down Expand Up @@ -145,7 +146,7 @@ func parseRelayerStartFlags(cmd *cobra.Command) (StartConfig, error) {
}

func addInitFlags(cmd *cobra.Command) *cobra.Command {
homeDir, err := base.DefaultServicePath("relayer")
homeDir, err := base.DefaultServicePath(ServiceNameRelayer)
if err != nil {
panic(err)
}
Expand All @@ -164,7 +165,7 @@ func parseInitFlags(cmd *cobra.Command) (InitConfig, error) {
}
if homeDir == "" {
var err error
homeDir, err = base.DefaultServicePath("relayer")
homeDir, err = base.DefaultServicePath(ServiceNameRelayer)
if err != nil {
return InitConfig{}, err
}
Expand Down