Merge pull request #125 from 0chain/initialState

Fixed initial state panic for non genesis miners.
0chain · Mar 24, 2021 · af1e32f · af1e32f
2 parents 0f0c84c + abe69bb
commit af1e32f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/code/go/0chain.net/miner/miner/main.go b/code/go/0chain.net/miner/miner/main.go
@@ -101,10 +101,7 @@ func main() {
 	}
 
 	initStates := state.NewInitStates()
-	err = initStates.Read(*initialStatesFile)
-	if err != nil {
-		Logger.Panic("Failed to read initialStates", zap.Any("Error", err))
-	}
+	initStateErr := initStates.Read(*initialStatesFile)
 
 	// if there's no magic_block_file commandline flag, use configured then
 	if *magicBlockFile == "" {
@@ -149,6 +146,10 @@ func main() {
 		node.Self.Underlying().N2NHost = n2nHostName
 		node.Self.Underlying().Port = portNum
 		node.Self.Underlying().Path = path
+	} else {
+		if initStateErr != nil {
+			Logger.Panic("Failed to read initialStates", zap.Any("Error", initStateErr))
+		}
 	}
 
 	if node.Self.Underlying().GetKey() == "" {

diff --git a/code/go/0chain.net/sharder/sharder/main.go b/code/go/0chain.net/sharder/sharder/main.go
@@ -148,10 +148,7 @@ func main() {
 	}
 
 	initStates := state.NewInitStates()
-	err = initStates.Read(*initialStatesFile)
-	if err != nil {
-		Logger.Panic("Failed to read initialStates", zap.Any("Error", err))
-	}
+	initStateErr := initStates.Read(*initialStatesFile)
 
 	// if there's no magic_block_file commandline flag, use configured then
 	if *magicBlockFile == "" {
@@ -200,6 +197,10 @@ func main() {
 		selfNode.Port = portNum
 		selfNode.Type = node.NodeTypeSharder
 		selfNode.Path = path
+	} else {
+		if initStateErr != nil {
+			Logger.Panic("Failed to read initialStates", zap.Any("Error", initStateErr))
+		}
 	}
 	if selfNode.Type != node.NodeTypeSharder {
 		Logger.Panic("node not configured as sharder")