Skip to content

Commit 6eb75e0

Browse files
committed
Load top level config only when needed
`configtxgen` always loads TopLevel from config yaml, which logs `OrdererType` in `Orderer` section, whose value is `solo` in most our sample configs. However, loaded TopLevel is only used when `--printOrg` is specified. This CR changes `configtxgen` to load TopLevel only when `--printOrg` is specified. FAB-16332 #done Change-Id: I4065905bd5ba993c4d31123c3b766f26270df699 Signed-off-by: Jay Guo <guojiannan1101@gmail.com>
1 parent 7468cca commit 6eb75e0

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

cmd/configtxgen/main.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,6 @@ func main() {
239239
profileConfig = genesisconfig.Load(profile)
240240
}
241241
}
242-
var topLevelConfig *genesisconfig.TopLevel
243-
if configPath != "" {
244-
topLevelConfig = genesisconfig.LoadTopLevel(configPath)
245-
} else {
246-
topLevelConfig = genesisconfig.LoadTopLevel()
247-
}
248242

249243
var baseProfile *genesisconfig.Profile
250244
if channelCreateTxBaseProfile != "" {
@@ -289,6 +283,13 @@ func main() {
289283
}
290284

291285
if printOrg != "" {
286+
var topLevelConfig *genesisconfig.TopLevel
287+
if configPath != "" {
288+
topLevelConfig = genesisconfig.LoadTopLevel(configPath)
289+
} else {
290+
topLevelConfig = genesisconfig.LoadTopLevel()
291+
}
292+
292293
if err := doPrintOrg(topLevelConfig, printOrg); err != nil {
293294
logger.Fatalf("Error on printOrg: %s", err)
294295
}

0 commit comments

Comments
 (0)