Skip to content

Commit fe769c9

Browse files
holimanholiman
committed
cmd/geth: different way to construct flags
1 parent e25b41f commit fe769c9

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

‎cmd/geth/dbcmd.go‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -78,29 +78,29 @@ Remove blockchain and state databases`,
7878
Action: utils.MigrateFlags(inspect),
7979
Name: "inspect",
8080
ArgsUsage: "<prefix> <start>",
81-
Flags: append([]cli.Flag{
81+
Flags: utils.GroupFlags([]cli.Flag{
8282
utils.SyncModeFlag,
83-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
83+
}, utils.NetworkFlags, utils.DatabasePathFlags),
8484
Usage: "Inspect the storage size for each type of data in the database",
8585
Description: `This commands iterates the entire database. If the optional 'prefix' and 'start' arguments are provided, then the iteration is limited to the given subset of data.`,
8686
}
8787
dbStatCmd = cli.Command{
8888
Action: utils.MigrateFlags(dbStats),
8989
Name: "stats",
9090
Usage: "Print leveldb statistics",
91-
Flags: append([]cli.Flag{
91+
Flags: utils.GroupFlags([]cli.Flag{
9292
utils.SyncModeFlag,
93-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
93+
}, utils.NetworkFlags, utils.DatabasePathFlags),
9494
}
9595
dbCompactCmd = cli.Command{
9696
Action: utils.MigrateFlags(dbCompact),
9797
Name: "compact",
9898
Usage: "Compact leveldb database. WARNING: May take a very long time",
99-
Flags: append([]cli.Flag{
99+
Flags: utils.GroupFlags([]cli.Flag{
100100
utils.SyncModeFlag,
101101
utils.CacheFlag,
102102
utils.CacheDatabaseFlag,
103-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
103+
}, utils.NetworkFlags, utils.DatabasePathFlags),
104104
Description: `This command performs a database compaction.
105105
WARNING: This operation may take a very long time to finish, and may cause database
106106
corruption if it is aborted during execution'!`,
@@ -110,19 +110,19 @@ corruption if it is aborted during execution'!`,
110110
Name: "get",
111111
Usage: "Show the value of a database key",
112112
ArgsUsage: "<hex-encoded key>",
113-
Flags: append([]cli.Flag{
113+
Flags: utils.GroupFlags([]cli.Flag{
114114
utils.SyncModeFlag,
115-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
115+
}, utils.NetworkFlags, utils.DatabasePathFlags),
116116
Description: "This command looks up the specified database key from the database.",
117117
}
118118
dbDeleteCmd = cli.Command{
119119
Action: utils.MigrateFlags(dbDelete),
120120
Name: "delete",
121121
Usage: "Delete a database key (WARNING: may corrupt your database)",
122122
ArgsUsage: "<hex-encoded key>",
123-
Flags: append([]cli.Flag{
123+
Flags: utils.GroupFlags([]cli.Flag{
124124
utils.SyncModeFlag,
125-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
125+
}, utils.NetworkFlags, utils.DatabasePathFlags),
126126
Description: `This command deletes the specified database key from the database.
127127
WARNING: This is a low-level operation which may cause database corruption!`,
128128
}
@@ -131,9 +131,9 @@ WARNING: This is a low-level operation which may cause database corruption!`,
131131
Name: "put",
132132
Usage: "Set the value of a database key (WARNING: may corrupt your database)",
133133
ArgsUsage: "<hex-encoded key> <hex-encoded value>",
134-
Flags: append([]cli.Flag{
134+
Flags: utils.GroupFlags([]cli.Flag{
135135
utils.SyncModeFlag,
136-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
136+
}, utils.NetworkFlags, utils.DatabasePathFlags),
137137
Description: `This command sets a given database key to the given value.
138138
WARNING: This is a low-level operation which may cause database corruption!`,
139139
}
@@ -142,58 +142,58 @@ WARNING: This is a low-level operation which may cause database corruption!`,
142142
Name: "dumptrie",
143143
Usage: "Show the storage key/values of a given storage trie",
144144
ArgsUsage: "<hex-encoded storage trie root> <hex-encoded start (optional)> <int max elements (optional)>",
145-
Flags: append([]cli.Flag{
145+
Flags: utils.GroupFlags([]cli.Flag{
146146
utils.SyncModeFlag,
147-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
147+
}, utils.NetworkFlags, utils.DatabasePathFlags),
148148
Description: "This command looks up the specified database key from the database.",
149149
}
150150
dbDumpFreezerIndex = cli.Command{
151151
Action: utils.MigrateFlags(freezerInspect),
152152
Name: "freezer-index",
153153
Usage: "Dump out the index of a given freezer type",
154154
ArgsUsage: "<type> <start (int)> <end (int)>",
155-
Flags: append([]cli.Flag{
155+
Flags: utils.GroupFlags([]cli.Flag{
156156
utils.SyncModeFlag,
157-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
157+
}, utils.NetworkFlags, utils.DatabasePathFlags),
158158
Description: "This command displays information about the freezer index.",
159159
}
160160
dbImportCmd = cli.Command{
161161
Action: utils.MigrateFlags(importLDBdata),
162162
Name: "import",
163163
Usage: "Imports leveldb-data from an exported RLP dump.",
164164
ArgsUsage: "<dumpfile> <start (optional)",
165-
Flags: append([]cli.Flag{
165+
Flags: utils.GroupFlags([]cli.Flag{
166166
utils.SyncModeFlag,
167-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
167+
}, utils.NetworkFlags, utils.DatabasePathFlags),
168168
Description: "The import command imports the specific chain data from an RLP encoded stream.",
169169
}
170170
dbExportCmd = cli.Command{
171171
Action: utils.MigrateFlags(exportChaindata),
172172
Name: "export",
173173
Usage: "Exports the chain data into an RLP dump. If the <dumpfile> has .gz suffix, gzip compression will be used.",
174174
ArgsUsage: "<type> <dumpfile>",
175-
Flags: append([]cli.Flag{
175+
Flags: utils.GroupFlags([]cli.Flag{
176176
utils.SyncModeFlag,
177-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
177+
}, utils.NetworkFlags, utils.DatabasePathFlags),
178178
Description: "Exports the specified chain data to an RLP encoded stream, optionally gzip-compressed.",
179179
}
180180
dbMetadataCmd = cli.Command{
181181
Action: utils.MigrateFlags(showMetaData),
182182
Name: "metadata",
183183
Usage: "Shows metadata about the chain status.",
184-
Flags: append([]cli.Flag{
184+
Flags: utils.GroupFlags([]cli.Flag{
185185
utils.SyncModeFlag,
186-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
186+
}, utils.NetworkFlags, utils.DatabasePathFlags),
187187
Description: "Shows metadata about the chain status.",
188188
}
189189
dbMigrateFreezerCmd = cli.Command{
190190
Action: utils.MigrateFlags(freezerMigrate),
191191
Name: "freezer-migrate",
192192
Usage: "Migrate legacy parts of the freezer. (WARNING: may take a long time)",
193193
ArgsUsage: "",
194-
Flags: append([]cli.Flag{
194+
Flags: utils.GroupFlags([]cli.Flag{
195195
utils.SyncModeFlag,
196-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
196+
}, utils.NetworkFlags, utils.DatabasePathFlags),
197197
Description: `The freezer-migrate command checks your database for receipts in a legacy format and updates those.
198198
WARNING: please back-up the receipt files in your ancients before running this command.`,
199199
}

‎cmd/geth/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ var (
5858
// The app that holds all commands and flags.
5959
app = flags.NewApp(gitCommit, gitDate, "the go-ethereum command line interface")
6060
// flags that configure the node
61-
nodeFlags = append([]cli.Flag{
61+
nodeFlags = utils.GroupFlags([]cli.Flag{
6262
utils.IdentityFlag,
6363
utils.UnlockedAccountFlag,
6464
utils.PasswordFileFlag,
@@ -152,7 +152,7 @@ var (
152152
utils.GpoIgnoreGasPriceFlag,
153153
utils.MinerNotifyFullFlag,
154154
configFileFlag,
155-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...)
155+
}, utils.NetworkFlags, utils.DatabasePathFlags)
156156

157157
rpcFlags = []cli.Flag{
158158
utils.HTTPEnabledFlag,

‎cmd/geth/snapshot.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ var (
6060
ArgsUsage: "<root>",
6161
Action: utils.MigrateFlags(pruneState),
6262
Category: "MISCELLANEOUS COMMANDS",
63-
Flags: append([]cli.Flag{
63+
Flags: utils.GroupFlags([]cli.Flag{
6464
utils.CacheTrieJournalFlag,
6565
utils.BloomFilterSizeFlag,
66-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
66+
}, utils.NetworkFlags, utils.DatabasePathFlags),
6767
Description: `
6868
geth snapshot prune-state <state-root>
6969
will prune historical state data with the help of the state snapshot.
@@ -144,12 +144,12 @@ It's also usable without snapshot enabled.
144144
ArgsUsage: "[? <blockHash> | <blockNum>]",
145145
Action: utils.MigrateFlags(dumpState),
146146
Category: "MISCELLANEOUS COMMANDS",
147-
Flags: append([]cli.Flag{
147+
Flags: utils.GroupFlags([]cli.Flag{
148148
utils.ExcludeCodeFlag,
149149
utils.ExcludeStorageFlag,
150150
utils.StartKeyFlag,
151151
utils.DumpLimitFlag,
152-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
152+
}, utils.NetworkFlags, utils.DatabasePathFlags),
153153
Description: `
154154
This command is semantically equivalent to 'geth dump', but uses the snapshots
155155
as the backend data source, making this command a lot faster.

‎cmd/geth/usage.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
var AppHelpFlagGroups = []flags.FlagGroup{
3333
{
3434
Name: "ETHEREUM",
35-
Flags: append([]cli.Flag{
35+
Flags: utils.GroupFlags([]cli.Flag{
3636
configFileFlag,
3737
utils.MinFreeDiskSpaceFlag,
3838
utils.KeyStoreDirFlag,
@@ -47,7 +47,7 @@ var AppHelpFlagGroups = []flags.FlagGroup{
4747
utils.IdentityFlag,
4848
utils.LightKDFFlag,
4949
utils.EthPeerRequiredBlocksFlag,
50-
}, utils.GroupFlags(utils.NetworkFlags, utils.DatabasePathFlags)...),
50+
}, utils.NetworkFlags, utils.DatabasePathFlags),
5151
},
5252
{
5353
Name: "LIGHT CLIENT",

0 commit comments

Comments
 (0)