fix: Initial fix for password runtime panic

lukso-network · Jul 5, 2023 · 119ed4a · 119ed4a
1 parent 216091a
commit 119ed4a
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/commands/start.go b/commands/start.go
@@ -130,20 +130,15 @@ func startValidator(ctx *cli.Context) (err error) {
 		if err != nil {
 			err = utils.Exit(fmt.Sprintf("❌  There was an error while reading password: %v", err), 1)
 		}
-	}
-	if err != nil {
-		return
-	}
-
-	err = ctx.Set(flags.ValidatorWalletPasswordFileFlag, passwordPipe.Name())
-	if err != nil {
-		return
+		err = ctx.Set(flags.ValidatorWalletPasswordFileFlag, passwordPipe.Name())
+		if err != nil {
+			return
+		}
+		defer func() {
+			os.Remove(passwordPipe.Name())
+		}()
 	}
 
-	defer func() {
-		os.Remove(passwordPipe.Name())
-	}()
-
 	args, err := validatorClient.PrepareStartFlags(ctx)
 	if err != nil {
 		err = utils.Exit(fmt.Sprintf("❌  There was an error while preparing %s flags: %v", validatorClient.Name(), err), 1)
@@ -154,8 +149,6 @@ func startValidator(ctx *cli.Context) (err error) {
 		err = utils.Exit(fmt.Sprintf("❌  There was an error while starting %s: %v", validatorClient.Name(), err), 1)
 	}
 
-	os.Remove(passwordPipe.Name())
-
 	log.Info("⚙️  Please wait a few seconds while your password is being validated...")
 	time.Sleep(time.Second * 10) // should be enough