Skip to content

Commit a58aae7

Browse files
Refactor flags, defaults and usage
1 parent 1709a05 commit a58aae7

File tree

2 files changed

+141
-220
lines changed

2 files changed

+141
-220
lines changed

cmd/juno/dbcmd.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func DBCmd(defaultDBPath string) *cobra.Command {
3939
Long: `This command allows you to perform database operations.`,
4040
}
4141

42-
dbCmd.PersistentFlags().String(dbPathF, defaultDBPath, dbPathUsage)
42+
dbCmd.PersistentFlags().String(dbPath.flag, defaultDBPath, dbPath.usage)
4343
dbCmd.AddCommand(DBInfoCmd(), DBSizeCmd(), DBRevertCmd())
4444
return dbCmd
4545
}
@@ -75,7 +75,7 @@ func DBRevertCmd() *cobra.Command {
7575
}
7676

7777
func dbInfo(cmd *cobra.Command, args []string) error {
78-
dbPath, err := cmd.Flags().GetString(dbPathF)
78+
dbPath, err := cmd.Flags().GetString(dbPath.flag)
7979
if err != nil {
8080
return err
8181
}
@@ -132,7 +132,7 @@ func dbInfo(cmd *cobra.Command, args []string) error {
132132
}
133133

134134
func dbRevert(cmd *cobra.Command, args []string) error {
135-
dbPath, err := cmd.Flags().GetString(dbPathF)
135+
dbPath, err := cmd.Flags().GetString(dbPath.flag)
136136
if err != nil {
137137
return err
138138
}
@@ -176,16 +176,16 @@ func dbRevert(cmd *cobra.Command, args []string) error {
176176
}
177177

178178
func dbSize(cmd *cobra.Command, args []string) error {
179-
dbPath, err := cmd.Flags().GetString(dbPathF)
179+
path, err := cmd.Flags().GetString(dbPath.flag)
180180
if err != nil {
181181
return err
182182
}
183183

184-
if dbPath == "" {
185-
return fmt.Errorf("--%v cannot be empty", dbPathF)
184+
if path == "" {
185+
return fmt.Errorf("--%v cannot be empty", dbPath.flag)
186186
}
187187

188-
pebbleDB, err := openDB(dbPath)
188+
pebbleDB, err := openDB(path)
189189
if err != nil {
190190
return err
191191
}

0 commit comments

Comments
 (0)