fix 647:

internal/handler/wallet/backup.go

@@ -3,11 +3,11 @@ package wallet
 import (
 	"fmt"
 	"io"
+	"net/http"
 	"os"
 
 	"github.com/awnumar/memguard"
 	"github.com/go-openapi/runtime/middleware"
-	"github.com/massalabs/station-massa-wallet/api/server/models"
 	"github.com/massalabs/station-massa-wallet/api/server/restapi/operations"
 	walletapp "github.com/massalabs/station-massa-wallet/pkg/app"
 	"github.com/massalabs/station-massa-wallet/pkg/prompt"
@@ -34,10 +34,7 @@ func (w *walletBackupAccount) Handle(params operations.BackupAccountParams) midd
 	if err == walletmanager.AccountNotFoundError {
 		return operations.NewGetAccountNotFound()
 	} else if err != nil {
-		return operations.NewGetAccountInternalServerError().WithPayload(&models.Error{
-			Code:    errorGetWallets,
-			Message: err.Error(),
-		})
+		return newErrorResponse(err.Error(), errorGetWallets, http.StatusInternalServerError)
 	}
 
 	promptRequest := prompt.PromptRequest{
@@ -47,11 +44,7 @@ func (w *walletBackupAccount) Handle(params operations.BackupAccountParams) midd
 
 	promptOutput, err := prompt.WakeUpPrompt(w.prompterApp, promptRequest, acc)
 	if err != nil {
-		return operations.NewBackupAccountUnauthorized().WithPayload(
-			&models.Error{
-				Code:    errorCanceledAction,
-				Message: "Unable to backup account",
-			})
+		return newErrorResponse("Unable to backup account", errorCanceledAction, http.StatusUnauthorized)
 	}
 
 	// If the user choose to backup the wallet using the yaml file, promptOutput will be a BackupMethod
@@ -62,35 +55,25 @@ func (w *walletBackupAccount) Handle(params operations.BackupAccountParams) midd
 	var publicKey string = ""
 
 	if isYmlBackup {
-		walletErr := w.saveAccountFile(params.Nickname)
-		if walletErr != nil {
+		err = w.saveAccountFile(params.Nickname)
+		if err != nil {
 			w.prompterApp.EmitEvent(walletapp.PromptResultEvent,
-				walletapp.EventData{Success: false, CodeMessage: walletErr.CodeErr})
+				walletapp.EventData{Success: false, CodeMessage: utils.WailsErrorCode(err)})
 
-			return operations.NewBackupAccountBadRequest().WithPayload(
-				&models.Error{
-					Code:    errorSaveAccount,
-					Message: walletErr.CodeErr,
-				})
+			return newErrorResponse(utils.ErrAccountFile, errorSaveAccount, http.StatusBadRequest)
 		}
 	} else {
 		guardedPassword, _ := promptOutput.(*memguard.LockedBuffer)
 		guardedPrivateKey, err := acc.PrivateKeyTextInClear(guardedPassword)
 		if err != nil {
-			return operations.NewBackupAccountInternalServerError().WithPayload(&models.Error{
-				Code:    errorGetWallets,
-				Message: err.Error(),
-			})
+			return newErrorResponse(err.Error(), errorGetWallets, http.StatusInternalServerError)
 		}
 		defer guardedPrivateKey.Destroy()
 		privateKey = string(guardedPrivateKey.Bytes())
 
 		publicKeyBytes, err := acc.PublicKey.MarshalText()
 		if err != nil {
-			return operations.NewBackupAccountInternalServerError().WithPayload(&models.Error{
-				Code:    errorGetWallets,
-				Message: err.Error(),
-			})
+			return newErrorResponse(err.Error(), errorGetWallets, http.StatusInternalServerError)
 		}
 
 		publicKey = string(publicKeyBytes)
@@ -102,60 +85,42 @@ func (w *walletBackupAccount) Handle(params operations.BackupAccountParams) midd
 	}
 
 	w.prompterApp.EmitEvent(walletapp.PromptResultEvent,
-		walletapp.EventData{Success: true, CodeMessage: utils.MsgBackupSuccess, Data: data})
+		walletapp.EventData{Success: true, Data: data})
 
 	return operations.NewBackupAccountNoContent()
 }
 
-func (w *walletBackupAccount) saveAccountFile(nickname string) *walletmanager.WalletError {
+func (w *walletBackupAccount) saveAccountFile(nickname string) error {
 	dstFile, err := w.prompterApp.SelectBackupFilepath(nickname)
 	if err != nil {
-		return &walletmanager.WalletError{
-			Err:     err,
-			CodeErr: utils.ErrAccountFile,
-		}
+		return err
 	}
 
 	if dstFile == "" {
-		return &walletmanager.WalletError{
-			Err:     fmt.Errorf("no file selected"),
-			CodeErr: utils.ActionCanceled,
-		}
+		return fmt.Errorf("no file selected: %w", utils.ErrActionCanceled)
 	}
 
 	// Create the destination file
 	destination, err := os.Create(dstFile)
 	if err != nil {
-		return &walletmanager.WalletError{
-			Err:     err,
-			CodeErr: utils.ErrAccountFile,
-		}
+		return err
 	}
 	defer destination.Close()
 
 	srcFile, err := w.prompterApp.App().WalletManager.AccountPath(nickname)
 	if err != nil {
-		return &walletmanager.WalletError{
-			Err:     err,
-			CodeErr: utils.ErrAccountFile,
-		}
+		return err
 	}
 
 	source, err := os.Open(srcFile)
 	if err != nil {
-		return &walletmanager.WalletError{
-			Err:     err,
-			CodeErr: utils.ErrAccountFile,
-		}
+		return err
 	}
 	defer source.Close()
 
 	_, err = io.Copy(destination, source)
 	if err != nil {
-		return &walletmanager.WalletError{
-			Err:     err,
-			CodeErr: utils.ErrAccountFile,
-		}
+		return err
 	}
 
 	return nil

internal/handler/wallet/backup_test.go

@@ -75,7 +75,7 @@ func Test_walletBackupAccount_Handle(t *testing.T) {
 
 		result := <-testResult
 
-		checkResultChannel(t, result, true, "Backup Success")
+		checkResultChannel(t, result, true, "")
 	})
 
 	t.Run("chose private backup then cancel", func(t *testing.T) {
@@ -133,7 +133,7 @@ func Test_walletBackupAccount_Handle(t *testing.T) {
 		assert.Equal(t, "S", string(data.PrivateKey[0]))
 		assert.Equal(t, string(publicKeyBytes), data.PublicKey)
 
-		checkResultChannel(t, result, true, "Backup Success")
+		checkResultChannel(t, result, true, "")
 	})
 
 	err = os.Remove(WalletBackupFilepath)

internal/handler/wallet/create.go

@@ -66,7 +66,7 @@ func (w *walletCreate) Handle(params operations.CreateAccountParams) middleware.
 	}
 
 	w.prompterApp.EmitEvent(walletapp.PromptResultEvent,
-		walletapp.EventData{Success: true, CodeMessage: utils.MsgAccountCreated})
+		walletapp.EventData{Success: true})
 
 	infos, err := w.massaClient.GetAccountsInfos([]account.Account{*acc})
 	if err != nil {

internal/handler/wallet/create_test.go

@@ -55,7 +55,7 @@ func Test_walletCreate_Handle(t *testing.T) {
 		if len(test.password) > 0 && test.statusCode == http.StatusOK {
 			result := <-testResult
 
-			checkResultChannel(t, result, true, "New password created")
+			checkResultChannel(t, result, true, "")
 
 			assertWallet(t, prompterApp.App().WalletManager, nickname)
 		}

internal/handler/wallet/delete.go

@@ -78,7 +78,7 @@ func (w *walletDelete) Handle(params operations.DeleteAccountParams) middleware.
 	}
 
 	w.prompterApp.EmitEvent(walletapp.PromptResultEvent,
-		walletapp.EventData{Success: true, CodeMessage: utils.MsgAccountDeleted})
+		walletapp.EventData{Success: true})
 
 	return operations.NewDeleteAccountNoContent()
 }

internal/handler/wallet/delete_test.go

@@ -89,7 +89,7 @@ func Test_walletDelete_Handle(t *testing.T) {
 
 		result := <-testResult
 
-		checkResultChannel(t, result, true, utils.MsgAccountDeleted)
+		checkResultChannel(t, result, true, "")
 
 		_, err = prompterApp.App().WalletManager.GetAccount(nickname)
 		assert.Error(t, err, "Wallet should have been deleted")

internal/handler/wallet/get.go

@@ -72,7 +72,7 @@ func (w *walletGet) Handle(params operations.GetAccountParams) middleware.Respon
 		defer guardedPrivateKey.Destroy()
 
 		w.prompterApp.EmitEvent(walletapp.PromptResultEvent,
-			walletapp.EventData{Success: true, CodeMessage: utils.MsgAccountUnprotected})
+			walletapp.EventData{Success: true})
 
 		modelWallet.KeyPair, resp = newKeyPairModel(*acc, guardedPrivateKey)
 		if resp != nil {

internal/handler/wallet/get_test.go

@@ -109,7 +109,7 @@ func Test_getWallet_handler(t *testing.T) {
 
 		result := <-testResult
 
-		checkResultChannel(t, result, true, "Unprotect Success")
+		checkResultChannel(t, result, true, "")
 	})
 }
 

internal/handler/wallet/import.go

@@ -9,7 +9,6 @@ import (
 	walletapp "github.com/massalabs/station-massa-wallet/pkg/app"
 	"github.com/massalabs/station-massa-wallet/pkg/network"
 	"github.com/massalabs/station-massa-wallet/pkg/prompt"
-	"github.com/massalabs/station-massa-wallet/pkg/utils"
 	"github.com/massalabs/station-massa-wallet/pkg/wallet/account"
 )
 
@@ -43,7 +42,7 @@ func (w *walletImport) Handle(_ operations.ImportAccountParams) middleware.Respo
 	acc, _ := promptOutput.(*account.Account)
 
 	w.prompterApp.EmitEvent(walletapp.PromptResultEvent,
-		walletapp.EventData{Success: true, CodeMessage: utils.MsgAccountImported})
+		walletapp.EventData{Success: true})
 
 	infos, err := w.massaClient.GetAccountsInfos([]account.Account{*acc})
 	if err != nil {

internal/handler/wallet/import_test.go

@@ -69,39 +69,13 @@ PublicKey: [0, 164, 243, 44, 155, 204, 6, 20, 131, 218, 97, 32, 58, 224, 189, 41
 
 		verifyStatusCode(t, resp, http.StatusOK)
 
-		checkResultChannel(t, result, true, "Import Success")
+		checkResultChannel(t, result, true, "")
 
 		assertWallet(t, prompterApp.App().WalletManager, nickname)
 
 		os.Remove(filePath)
 	})
 
-	t.Run("import invalid path file", func(t *testing.T) {
-		walletFile := "InvalidWallet"
-
-		filePath := "importMe.yaml"
-		// Write wallet file
-		data := []byte(walletFile)
-		err = os.WriteFile(filePath, data, 0o644)
-		assert.NoError(t, err)
-		defer os.Remove(filePath)
-
-		testResult := make(chan walletapp.EventData)
-
-		// Send filepath to prompter app and wait for result
-		go func(res chan walletapp.EventData) {
-			// Send invalid filename to prompter app and wait for result
-			prompterApp.App().PromptInput <- "invalidFilename"
-			failRes := <-resChan
-
-			checkResultChannel(t, failRes, false, utils.ErrInvalidFileExtension)
-		}(testResult)
-
-		resp := importWallet(t, api)
-
-		verifyStatusCode(t, resp, http.StatusUnauthorized)
-	})
-
 	t.Run("import invalid account file", func(t *testing.T) {
 		walletFile := "InvalidWallet"
 
@@ -184,8 +158,7 @@ PublicKey: [0, 164, 243, 44, 155, 204, 6, 20, 131, 218, 97, 32, 58, 224, 189, 41
 			password:   memguard.NewBufferFromBytes([]byte("aGoodPassword")),
 			wantStatus: http.StatusOK,
 			wantResult: walletapp.EventData{
-				Success:     true,
-				CodeMessage: utils.MsgAccountImported,
+				Success: true,
 			},
 		},
 		{

internal/handler/wallet/rolls.go

@@ -12,7 +12,6 @@ import (
 	walletapp "github.com/massalabs/station-massa-wallet/pkg/app"
 	"github.com/massalabs/station-massa-wallet/pkg/network"
 	"github.com/massalabs/station-massa-wallet/pkg/prompt"
-	"github.com/massalabs/station-massa-wallet/pkg/utils"
 	"github.com/massalabs/station-massa-wallet/pkg/wallet/account"
 	sendOperation "github.com/massalabs/station/pkg/node/sendoperation"
 	"github.com/massalabs/station/pkg/node/sendoperation/buyrolls"
@@ -81,7 +80,7 @@ func (t *tradeRolls) Handle(params operations.TradeRollsParams) middleware.Respo
 	}
 
 	t.prompterApp.EmitEvent(walletapp.PromptResultEvent,
-		walletapp.EventData{Success: true, CodeMessage: utils.MsgRollTradeSuccess})
+		walletapp.EventData{Success: true})
 
 	return operations.NewTradeRollsOK().WithPayload(
 		&models.OperationResponse{

internal/handler/wallet/sign.go

@@ -103,9 +103,10 @@ func (w *walletSign) Handle(params operations.SignParams) middleware.Responder {
 		password, err := w.PromptPassword(acc, promptRequest)
 		if err != nil {
 			msg := fmt.Sprintf("Unable to unprotect wallet: %s", err.Error())
-			if errors.Is(err, prompt.ErrWrongPassword) || errors.Is(err, prompt.ErrActionCanceled) {
+			if errors.Is(err, utils.ErrWrongPassword) || errors.Is(err, utils.ErrActionCanceled) {
 				return newErrorResponse(msg, errorGetWallets, http.StatusUnauthorized)
 			}
+
 			return newErrorResponse(msg, errorGetWallets, http.StatusInternalServerError)
 		}
 
@@ -147,7 +148,7 @@ func (w *walletSign) PromptPassword(acc *account.Account, promptRequest *prompt.
 	password, _ := promptOutput.(*memguard.LockedBuffer)
 
 	w.prompterApp.EmitEvent(walletapp.PromptResultEvent,
-		walletapp.EventData{Success: true, CodeMessage: utils.MsgAccountUnprotected})
+		walletapp.EventData{Success: true})
 
 	return password, nil
 }

internal/handler/wallet/sign_message.go

@@ -1,6 +1,7 @@
 package wallet
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 
@@ -47,11 +48,12 @@ func (w *walletSignMessage) Handle(params operations.SignMessageParams) middlewa
 	// Use the prompt-based logic to sign the message
 	promptOutput, err := prompt.WakeUpPrompt(w.prompterApp, *promptRequest, acc)
 	if err != nil {
-		return operations.NewSignMessageUnauthorized().WithPayload(
-			&models.Error{
-				Code:    errorCanceledAction,
-				Message: "Unable to unprotect wallet",
-			})
+		msg := fmt.Sprintf("Unable to unprotect wallet: %s", err.Error())
+		if errors.Is(err, utils.ErrWrongPassword) || errors.Is(err, utils.ErrActionCanceled) {
+			return newErrorResponse(msg, errorGetWallets, http.StatusUnauthorized)
+		}
+
+		return newErrorResponse(msg, errorGetWallets, http.StatusInternalServerError)
 	}
 
 	guardedPassword, _ := promptOutput.(*memguard.LockedBuffer)
@@ -62,7 +64,7 @@ func (w *walletSignMessage) Handle(params operations.SignMessageParams) middlewa
 	}
 
 	w.prompterApp.EmitEvent(walletapp.PromptResultEvent,
-		walletapp.EventData{Success: true, CodeMessage: utils.MsgAccountUnprotected})
+		walletapp.EventData{Success: true})
 
 	publicKeyBytes, err := acc.PublicKey.MarshalText()
 	if err != nil {

internal/handler/wallet/sign_test.go

@@ -66,7 +66,7 @@ func Test_walletSign_Handle(t *testing.T) {
 
 		result := <-testResult
 
-		checkResultChannel(t, result, true, utils.MsgAccountUnprotected)
+		checkResultChannel(t, result, true, "")
 	})
 
 	t.Run("sign a plain text message", func(t *testing.T) {
@@ -87,7 +87,7 @@ func Test_walletSign_Handle(t *testing.T) {
 
 		result := <-testResult
 
-		checkResultChannel(t, result, true, utils.MsgAccountUnprotected)
+		checkResultChannel(t, result, true, "")
 	})
 
 	// The handler will not return until a the good password is sent or the action is canceled
@@ -115,7 +115,7 @@ func Test_walletSign_Handle(t *testing.T) {
 
 		result := <-testResult
 
-		checkResultChannel(t, result, true, utils.MsgAccountUnprotected)
+		checkResultChannel(t, result, true, "")
 	})
 
 	t.Run("invalid password try, then action canceled by user", func(t *testing.T) {
@@ -152,7 +152,7 @@ func Test_walletSign_Handle(t *testing.T) {
 
 		result := <-testResult
 
-		checkResultChannel(t, result, true, "Unprotect Success")
+		checkResultChannel(t, result, true, "")
 
 		var body models.SignResponse
 		err = json.Unmarshal(resp.Body.Bytes(), &body)