From b962c63542019b4fe265eda2eba74201a4121c77 Mon Sep 17 00:00:00 2001
From: Sean Young <sean.young@monax.io>
Date: Wed, 20 Jun 2018 17:48:34 +0100
Subject: [PATCH] Set chain name before calling templating code
Signed-off-by: Sean Young <sean.young@monax.io>
---
cmd/burrow/commands/configure.go | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/cmd/burrow/commands/configure.go b/cmd/burrow/commands/configure.go
index f68ed820..29774735 100644
--- a/cmd/burrow/commands/configure.go
+++ b/cmd/burrow/commands/configure.go
@@ -205,6 +205,13 @@ func Configure(output Output) func(cmd *cli.Cmd) {
conf.GenesisDoc = genesisDoc
}
+ if *chainNameOpt != "" {
+ if conf.GenesisDoc == nil {
+ output.Fatalf("Unable to set ChainName since no GenesisDoc/GenesisSpec provided.")
+ }
+ conf.GenesisDoc.ChainName = *chainNameOpt
+ }
+
if conf.GenesisDoc != nil {
pkg.Config = conf.GenesisDoc
@@ -248,13 +255,6 @@ func Configure(output Output) func(cmd *cli.Cmd) {
}
}
- if *chainNameOpt != "" {
- if conf.GenesisDoc == nil {
- output.Fatalf("Unable to set ChainName since no GenesisDoc/GenesisSpec provided.")
- }
- conf.GenesisDoc.ChainName = *chainNameOpt
- }
-
if *separateGenesisDoc != "" {
if conf.GenesisDoc == nil {
output.Fatalf("Cannot write separate genesis doc since no GenesisDoc/GenesisSpec provided.")
--
GitLab