fixes

Author: mohammeds1992

cmd/push-validator/cmd_register.go

@@ -12,7 +12,7 @@ import (
 
 // Tests for runRegisterValidatorWithDeps covering the full registration flow.
 
-func TestRunRegisterValidatorWithDeps_NodeSyncing_JSON(t *testing.T) {
+func TestHandleRegisterValidator_NodeSyncing_JSON(t *testing.T) {
 	origOutput := flagOutput
 	origNonInteractive := flagNonInteractive
 	defer func() {
@@ -27,7 +27,7 @@ func TestRunRegisterValidatorWithDeps_NodeSyncing_JSON(t *testing.T) {
 		d.RemoteNode = &mockNodeClient{}
 	})
 
-	err := runRegisterValidatorWithDeps(d, d.Cfg, "myval", "mykey", "1500000000000000000", "0.10", "")
+	err := handleRegisterValidator(d)
 	if err == nil {
 		t.Fatal("expected error")
 	}
@@ -36,7 +36,7 @@ func TestRunRegisterValidatorWithDeps_NodeSyncing_JSON(t *testing.T) {
 	}
 }
 
-func TestRunRegisterValidatorWithDeps_NodeSyncing_Text(t *testing.T) {
+func TestHandleRegisterValidator_NodeSyncing_Text(t *testing.T) {
 	origOutput := flagOutput
 	origNonInteractive := flagNonInteractive
 	origNoColor := flagNoColor
@@ -57,7 +57,7 @@ func TestRunRegisterValidatorWithDeps_NodeSyncing_Text(t *testing.T) {
 		d.RemoteNode = &mockNodeClient{}
 	})
 
-	err := runRegisterValidatorWithDeps(d, d.Cfg, "myval", "mykey", "1500000000000000000", "0.10", "")
+	err := handleRegisterValidator(d)
 	if err == nil {
 		t.Fatal("expected error")
 	}
@@ -295,12 +295,10 @@ func TestRunRegisterValidatorWithDeps_RegistrationError_ValidatorAlreadyExists(t
 		}
 	})
 
+	// "validator already exist" is now treated as success (validator is already registered)
 	err := runRegisterValidatorWithDeps(d, d.Cfg, "myval", "mykey", "1500000000000000000", "0.10", "")
-	if err == nil {
-		t.Fatal("expected error")
-	}
-	if !containsSubstr(err.Error(), "validator registration failed") {
-		t.Errorf("unexpected error: %v", err)
+	if err != nil {
+		t.Fatalf("expected nil (validator already registered treated as success), got: %v", err)
 	}
 }
 
@@ -676,3 +674,67 @@ func (m *balanceRetryMockValidator) ImportKey(ctx context.Context, name string,
 func (m *balanceRetryMockValidator) GetEVMAddress(ctx context.Context, addr string) (string, error) {
 	return m.inner.GetEVMAddress(ctx, addr)
 }
+
+func (m *balanceRetryMockValidator) IsAddressValidator(ctx context.Context, cosmosAddr string) (bool, error) {
+	return m.inner.IsAddressValidator(ctx, cosmosAddr)
+}
+
+func TestRunRegisterValidatorWithDeps_ValidatorAlreadyExists_ReturnsSuccess(t *testing.T) {
+	origOutput := flagOutput
+	origNonInteractive := flagNonInteractive
+	origNoColor := flagNoColor
+	origNoEmoji := flagNoEmoji
+	defer func() {
+		flagOutput = origOutput
+		flagNonInteractive = origNonInteractive
+		flagNoColor = origNoColor
+		flagNoEmoji = origNoEmoji
+	}()
+	flagOutput = "text"
+	flagNonInteractive = true
+	flagNoColor = true
+	flagNoEmoji = true
+
+	d := registerDeps(func(d *Deps) {
+		d.Node = &mockNodeClient{status: node.Status{CatchingUp: false}}
+		d.RemoteNode = &mockNodeClient{}
+		d.Validator = &mockValidator{
+			importKeyResult: validator.KeyInfo{Name: "mykey", Address: "push1test"},
+			balanceResult:   "2000000000000000000",
+			registerErr:     fmt.Errorf("validator already exist"),
+			evmAddrResult:   "0xABCD",
+		}
+	})
+
+	err := runRegisterValidatorWithDeps(d, d.Cfg, "myval", "mykey", "1500000000000000000", "0.10", "word1 word2 word3 word4 word5 word6 word7 word8 word9 word10 word11 word12")
+	if err != nil {
+		t.Fatalf("expected nil (validator already registered treated as success), got: %v", err)
+	}
+}
+
+func TestRunRegisterValidatorWithDeps_ValidatorAlreadyExists_JSON(t *testing.T) {
+	origOutput := flagOutput
+	origNonInteractive := flagNonInteractive
+	defer func() {
+		flagOutput = origOutput
+		flagNonInteractive = origNonInteractive
+	}()
+	flagOutput = "json"
+	flagNonInteractive = true
+
+	d := registerDeps(func(d *Deps) {
+		d.Node = &mockNodeClient{status: node.Status{CatchingUp: false}}
+		d.RemoteNode = &mockNodeClient{}
+		d.Validator = &mockValidator{
+			importKeyResult: validator.KeyInfo{Name: "mykey", Address: "push1test"},
+			balanceResult:   "2000000000000000000",
+			registerErr:     fmt.Errorf("validator already exist"),
+			evmAddrResult:   "0xABCD",
+		}
+	})
+
+	err := runRegisterValidatorWithDeps(d, d.Cfg, "myval", "mykey", "1500000000000000000", "0.10", "word1 word2 word3 word4 word5 word6 word7 word8 word9 word10 word11 word12")
+	if err != nil {
+		t.Fatalf("expected nil (validator already registered treated as success), got: %v", err)
+	}
+}

cmd/push-validator/cmd_register_core_test.go

@@ -23,34 +23,37 @@ func TestPromptCommissionRate_ValidInput(t *testing.T) {
 }
 
 func TestPromptCommissionRate_InvalidInput(t *testing.T) {
-	p := &mockPrompter{responses: []string{"abc"}}
+	// Invalid input, then empty → falls back to default
+	p := &mockPrompter{responses: []string{"abc", ""}, interactive: true}
 	rate := promptCommissionRate(p, "0.10")
 	if rate != "0.10" {
 		t.Errorf("expected default 0.10, got %s", rate)
 	}
 }
 
 func TestPromptCommissionRate_TooHigh(t *testing.T) {
-	p := &mockPrompter{responses: []string{"150"}}
+	// Too high, then empty → falls back to default
+	p := &mockPrompter{responses: []string{"150", ""}, interactive: true}
 	rate := promptCommissionRate(p, "0.10")
 	if rate != "0.10" {
 		t.Errorf("expected default 0.10 for >100, got %s", rate)
 	}
 }
 
 func TestPromptCommissionRate_TooLow(t *testing.T) {
-	p := &mockPrompter{responses: []string{"0"}}
+	// Too low, then empty → falls back to default
+	p := &mockPrompter{responses: []string{"4", ""}, interactive: true}
 	rate := promptCommissionRate(p, "0.10")
 	if rate != "0.10" {
-		t.Errorf("expected default 0.10 for <1, got %s", rate)
+		t.Errorf("expected default 0.10 for <5, got %s", rate)
 	}
 }
 
 func TestPromptCommissionRate_BoundaryValues(t *testing.T) {
-	p := &mockPrompter{responses: []string{"1"}}
+	p := &mockPrompter{responses: []string{"5"}}
 	rate := promptCommissionRate(p, "0.10")
-	if rate != "0.01" {
-		t.Errorf("expected 0.01 for 1%%, got %s", rate)
+	if rate != "0.05" {
+		t.Errorf("expected 0.05 for 5%%, got %s", rate)
 	}
 
 	p = &mockPrompter{responses: []string{"100"}}
@@ -234,12 +237,11 @@ func TestCollectRegistrationInputs_DefaultValues(t *testing.T) {
 		CommissionRate: "0.10",
 	}
 
+	// Response 0: wallet choice → "" (default = create new)
+	// Response 1: key name prompt → "" (use default)
 	// Moniker prompt is skipped (not "" or "push-validator")
-	// Response 0: key name prompt → "" (use default)
-	// Response 1: wallet choice → "" (default = create new)
-	// Response 2: commission rate → "" (use default 0.10)
 	d.Prompter = &mockPrompter{
-		responses:   []string{"", "", ""},
+		responses:   []string{"", ""},
 		interactive: true,
 	}
 
@@ -253,9 +255,6 @@ func TestCollectRegistrationInputs_DefaultValues(t *testing.T) {
 	if result.KeyName != "my-key" {
 		t.Errorf("expected keyName my-key, got %s", result.KeyName)
 	}
-	if result.CommissionRate != "0.10" {
-		t.Errorf("expected rate 0.10, got %s", result.CommissionRate)
-	}
 }
 
 func TestCollectRegistrationInputs_CustomValues(t *testing.T) {
@@ -275,13 +274,12 @@ func TestCollectRegistrationInputs_CustomValues(t *testing.T) {
 		CommissionRate: "0.10",
 	}
 
-	// Moniker IS "push-validator" so moniker prompt fires
-	// Response 0: moniker → "custom-moniker"
+	// Response 0: wallet choice → "" (default = create new)
 	// Response 1: key name → "custom-key"
-	// Response 2: wallet choice → "" (default = create new)
-	// Response 3: commission rate → "20"
+	// Moniker IS "push-validator" so moniker prompt fires
+	// Response 2: moniker → "custom-moniker"
 	d.Prompter = &mockPrompter{
-		responses:   []string{"custom-moniker", "custom-key", "", "20"},
+		responses:   []string{"", "custom-key", "custom-moniker"},
 		interactive: true,
 	}
 
@@ -295,9 +293,6 @@ func TestCollectRegistrationInputs_CustomValues(t *testing.T) {
 	if result.KeyName != "custom-key" {
 		t.Errorf("expected custom-key, got %s", result.KeyName)
 	}
-	if result.CommissionRate != "0.20" {
-		t.Errorf("expected 0.20, got %s", result.CommissionRate)
-	}
 }
 
 func TestCollectRegistrationInputs_KeyExists_UseExisting(t *testing.T) {
@@ -324,9 +319,9 @@ func TestCollectRegistrationInputs_KeyExists_UseExisting(t *testing.T) {
 	runner.outputs[binPath+" keys show my-key -a --keyring-backend "+cfg.KeyringBackend+" --home "+cfg.HomeDir] = []byte("push1existing\n")
 	d.Runner = runner
 
-	// Response 0: key name → "" (use default "my-key" which exists)
-	// Key exists branch: Response 1: enter different name → "" (use existing)
-	// Response 2: commission rate → ""
+	// Response 0: wallet choice → "" (create new)
+	// Response 1: key name → "" (use default "my-key" which exists)
+	// Key exists branch: Response 2: enter different name → "" (use existing)
 	d.Prompter = &mockPrompter{
 		responses:   []string{"", "", ""},
 		interactive: true,
@@ -370,13 +365,11 @@ func TestCollectRegistrationInputs_KeyExists_EnterNewName(t *testing.T) {
 	runner.errors[binPath+" keys show new-key -a --keyring-backend "+cfg.KeyringBackend+" --home "+cfg.HomeDir] = errMock
 	d.Runner = runner
 
-	// Response 0: key name → "" (use default "existing-key" which exists)
-	// Key exists: Response 1: enter different name → "new-key"
-	// new-key doesn't exist, so wallet choice fires
-	// Response 2: wallet choice → "" (create new)
-	// Response 3: commission rate → "15"
+	// Response 0: wallet choice → "" (create new)
+	// Response 1: key name → "" (use default "existing-key" which exists)
+	// Key exists: Response 2: enter different name → "new-key"
 	d.Prompter = &mockPrompter{
-		responses:   []string{"", "new-key", "", "15"},
+		responses:   []string{"", "", "new-key"},
 		interactive: true,
 	}
 
@@ -387,9 +380,6 @@ func TestCollectRegistrationInputs_KeyExists_EnterNewName(t *testing.T) {
 	if result.KeyName != "new-key" {
 		t.Errorf("expected new-key, got %s", result.KeyName)
 	}
-	if result.CommissionRate != "0.15" {
-		t.Errorf("expected 0.15, got %s", result.CommissionRate)
-	}
 }
 
 func TestCollectRegistrationInputs_KeyExists_NewNameAlsoExists(t *testing.T) {
@@ -417,12 +407,11 @@ func TestCollectRegistrationInputs_KeyExists_NewNameAlsoExists(t *testing.T) {
 	runner.outputs[binPath+" keys show also-exists -a --keyring-backend "+cfg.KeyringBackend+" --home "+cfg.HomeDir] = []byte("push1b\n")
 	d.Runner = runner
 
-	// Response 0: key name → "" (use default which exists)
-	// Key exists: Response 1: enter different name → "also-exists" (also exists)
-	// Since new key also exists, wallet choice NOT called
-	// Response 2: commission rate → ""
+	// Response 0: wallet choice → "" (create new)
+	// Response 1: key name → "" (use default which exists)
+	// Key exists: Response 2: enter different name → "also-exists" (also exists)
 	d.Prompter = &mockPrompter{
-		responses:   []string{"", "also-exists", ""},
+		responses:   []string{"", "", "also-exists"},
 		interactive: true,
 	}
 

cmd/push-validator/cmd_register_prompt_test.go

@@ -135,28 +135,7 @@ func handleFullReset(cfg config.Config, sup process.Supervisor, prompters ...Pro
 		prompter = &ttyPrompter{}
 	}
 
-	// Stop node first and verify it stopped
-	if sup.IsRunning() {
-		if flagOutput != "json" {
-			fmt.Println(p.Colors.Info("Stopping node..."))
-		}
-		if err := sup.Stop(); err != nil {
-			if flagOutput == "json" {
-				p.JSON(map[string]any{"ok": false, "error": fmt.Sprintf("failed to stop node: %v", err)})
-				return err
-			} else {
-				p.Warn(p.Colors.Emoji("⚠") + fmt.Sprintf(" Could not stop node: %v", err))
-				response, pErr := prompter.ReadLine("Continue with full reset anyway? (y/N): ")
-				if pErr != nil || strings.ToLower(strings.TrimSpace(response)) != "y" {
-					p.Info("Full reset cancelled")
-					return nil
-				}
-			}
-		} else if flagOutput != "json" {
-			p.Success("✓ Node stopped")
-		}
-	}
-
+	// Require confirmation before stopping or modifying anything
 	if flagOutput != "json" {
 		fmt.Println()
 		fmt.Println(p.Colors.Warning(p.Colors.Emoji("⚠️") + "  FULL RESET - This will delete EVERYTHING"))
@@ -184,6 +163,28 @@ func handleFullReset(cfg config.Config, sup process.Supervisor, prompters ...Pro
 		}
 	}
 
+	// Stop node after confirmation
+	if sup.IsRunning() {
+		if flagOutput != "json" {
+			fmt.Println(p.Colors.Info("Stopping node..."))
+		}
+		if err := sup.Stop(); err != nil {
+			if flagOutput == "json" {
+				p.JSON(map[string]any{"ok": false, "error": fmt.Sprintf("failed to stop node: %v", err)})
+				return err
+			} else {
+				p.Warn(p.Colors.Emoji("⚠") + fmt.Sprintf(" Could not stop node: %v", err))
+				response, pErr := prompter.ReadLine("Continue with full reset anyway? (y/N): ")
+				if pErr != nil || strings.ToLower(strings.TrimSpace(response)) != "y" {
+					p.Info("Full reset cancelled")
+					return nil
+				}
+			}
+		} else if flagOutput != "json" {
+			p.Success("✓ Node stopped")
+		}
+	}
+
 	// Perform full reset
 	err := admin.FullReset(admin.FullResetOptions{
 		HomeDir: cfg.HomeDir,

cmd/push-validator/cmd_reset.go

@@ -559,6 +559,9 @@ func createSnapshotProgressCallback(output string) snapshot.ProgressFunc {
 					message = message[:57] + "..."
 				}
 				fmt.Printf("\r  → Extracting: %-60s", message)
+				if current == total && total > 0 {
+					fmt.Println()
+				}
 			}
 		}
 	}

cmd/push-validator/cmd_start.go

@@ -216,3 +216,7 @@ func (m *balanceIncrementingValidator) GetEVMAddress(ctx context.Context, addr s
 	return "", nil
 }
 
+func (m *balanceIncrementingValidator) IsAddressValidator(ctx context.Context, cosmosAddr string) (bool, error) {
+	return false, nil
+}
+

cmd/push-validator/helpers_balance_test.go

@@ -111,8 +111,10 @@ type mockValidator struct {
 	ensureKeyErr    error
 	importKeyResult validator.KeyInfo
 	importKeyErr    error
-	evmAddrResult   string
-	evmAddrErr      error
+	evmAddrResult          string
+	evmAddrErr             error
+	isAddressValidatorRes  bool
+	isAddressValidatorErr  error
 }
 
 func (m *mockValidator) Balance(ctx context.Context, addr string) (string, error) {
@@ -151,6 +153,10 @@ func (m *mockValidator) GetEVMAddress(ctx context.Context, addr string) (string,
 	return m.evmAddrResult, m.evmAddrErr
 }
 
+func (m *mockValidator) IsAddressValidator(ctx context.Context, cosmosAddr string) (bool, error) {
+	return m.isAddressValidatorRes, m.isAddressValidatorErr
+}
+
 // mockRunner implements CommandRunner for testing.
 type mockRunner struct {
 	outputs map[string][]byte // key: "name arg1 arg2", value: output