minor improvement

Author: 0xbcdev

cmd/gen_start_web.go

@@ -256,7 +256,7 @@ func GetGenStartWebCmd() *cobra.Command {
 				sb.WriteString(" --")
 				sb.WriteString(flagChainDescription)
 				sb.WriteString(" '")
-				sb.WriteString(chainDescription)
+				sb.WriteString(strings.ReplaceAll(chainDescription, "\\n", "\\\\n"))
 				sb.WriteString("'")
 			}
 			{

cmd/node/prune_data.go

@@ -130,7 +130,7 @@ func GetPruneNodeDataCmd() *cobra.Command {
 					return
 				}
 
-				if !pvs.Equals(pvsBackup) {
+				if !pvs.Equals(*pvsBackup) {
 					utils.ExitWithErrorMsg("ERR: backup file at", backupPrivValStateJson, "has different content with", filePathPrivValState)
 					return
 				}
@@ -158,7 +158,7 @@ func GetPruneNodeDataCmd() *cobra.Command {
 					utils.ExitWithErrorMsg("ERR: failed to load additional backup file", additionalBackupFile, ":", err)
 					return
 				}
-				if !pvs.Equals(backupPsv2) {
+				if !pvs.Equals(*backupPsv2) {
 					utils.ExitWithErrorMsg("ERR: additional backup file at", additionalBackupFile, "has different content with", filePathPrivValState)
 					return
 				}
@@ -199,7 +199,7 @@ func GetPruneNodeDataCmd() *cobra.Command {
 					return
 				}
 
-				if !pvs.Equals(pvsBackup) {
+				if !pvs.Equals(*pvsBackup) {
 					utils.ExitWithErrorMsg("ERR: content of", fileNamePrivValState, "is changed after additional backup file created")
 					return
 				}

types/priv_validator_state.go

@@ -8,11 +8,22 @@ import (
 )
 
 type PrivateValidatorState struct {
+	originBz  []byte
 	Height    string `json:"height"`
 	Round     int    `json:"round"`
 	Step      int    `json:"step"`
-	Signature string `json:"signature"`
-	SignBytes string `json:"signbytes"`
+	Signature string `json:"signature,omitempty"`
+	SignBytes string `json:"signbytes,omitempty"`
+}
+
+func NewEmptyPrivateValidatorState() PrivateValidatorState {
+	return PrivateValidatorState{
+		Height:    "0",
+		Round:     0,
+		Step:      0,
+		Signature: "",
+		SignBytes: "",
+	}
 }
 
 func (pvs PrivateValidatorState) IsEmpty() bool {
@@ -23,15 +34,15 @@ func (pvs PrivateValidatorState) IsEmpty() bool {
 		pvs.SignBytes == ""
 }
 
-func (pvs *PrivateValidatorState) Equals(other *PrivateValidatorState) bool {
+func (pvs PrivateValidatorState) Equals(other PrivateValidatorState) bool {
 	return pvs.Height == other.Height &&
 		pvs.Round == other.Round &&
 		pvs.Step == other.Step &&
 		pvs.Signature == other.Signature &&
 		pvs.SignBytes == other.SignBytes
 }
 
-func (pvs *PrivateValidatorState) CompareState(other *PrivateValidatorState) (cmp int, differentSigns bool) {
+func (pvs PrivateValidatorState) CompareState(other PrivateValidatorState) (cmp int, differentSigns bool) {
 	var heightPvs, heightOther int64
 	var err error
 	if pvs.Height != "0" {
@@ -61,11 +72,12 @@ func (pvs *PrivateValidatorState) CompareState(other *PrivateValidatorState) (cm
 
 	if pvs.Step < other.Step {
 		return -1, true
-	} else {
+	} else if pvs.Step > other.Step {
 		return 1, true
 	}
 
-	return 0, pvs.Signature == other.Signature && pvs.SignBytes == other.SignBytes
+	sameSign := pvs.Signature == other.Signature && pvs.SignBytes == other.SignBytes
+	return 0, !sameSign
 }
 
 func (pvs *PrivateValidatorState) LoadFromJSONFile(filePath string) error {
@@ -81,5 +93,26 @@ func (pvs *PrivateValidatorState) LoadFromJSON(bz []byte) error {
 	if err != nil {
 		return errors.Wrap(err, "failed to unmarshal JSON")
 	}
+	pvs.originBz = bz
 	return nil
 }
+
+func (pvs *PrivateValidatorState) SaveToJSONFile(filePath string) error {
+	jsonStr := pvs.Json()
+	err := os.WriteFile(filePath, []byte(jsonStr), 0644)
+	if err != nil {
+		return errors.Wrap(err, "failed to write file")
+	}
+	return nil
+}
+
+func (pvs PrivateValidatorState) Json() string {
+	if len(pvs.originBz) > 0 {
+		return string(pvs.originBz)
+	}
+	bz, err := json.MarshalIndent(pvs, "", "  ")
+	if err != nil {
+		panic(errors.Wrap(err, "failed to marshal JSON"))
+	}
+	return string(bz)
+}