fix: refactor usage of err.Error() (#1286)

Co-authored-by: Apple <[email protected]>
dymensionxyz · Oct 9, 2024 · 8d5fe8d · 8d5fe8d
1 parent 2717c18
commit 8d5fe8d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/x/rollapp/types/message_add_app.go b/x/rollapp/types/message_add_app.go
@@ -1,7 +1,8 @@
 package types
 
 import (
-	errorsmod "cosmossdk.io/errors"
+	"errors"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -57,7 +58,7 @@ func (msg *MsgAddApp) GetApp() App {
 func (msg *MsgAddApp) ValidateBasic() error {
 	_, err := sdk.AccAddressFromBech32(msg.Creator)
 	if err != nil {
-		return errorsmod.Wrap(ErrInvalidCreatorAddress, err.Error())
+		return errors.Join(ErrInvalidCreatorAddress, err)
 	}
 
 	app := msg.GetApp()

diff --git a/x/rollapp/types/message_remove_app.go b/x/rollapp/types/message_remove_app.go
@@ -1,6 +1,8 @@
 package types
 
 import (
+	"errors"
+
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
@@ -53,7 +55,7 @@ func (msg *MsgRemoveApp) GetApp() App {
 func (msg *MsgRemoveApp) ValidateBasic() error {
 	_, err := sdk.AccAddressFromBech32(msg.Creator)
 	if err != nil {
-		return errorsmod.Wrap(ErrInvalidCreatorAddress, err.Error())
+		return errors.Join(ErrInvalidCreatorAddress, err)
 	}
 
 	if msg.Id == 0 {

diff --git a/x/rollapp/types/message_update_app.go b/x/rollapp/types/message_update_app.go
@@ -1,6 +1,8 @@
 package types
 
 import (
+	"errors"
+
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
@@ -58,7 +60,7 @@ func (msg *MsgUpdateApp) GetApp() App {
 func (msg *MsgUpdateApp) ValidateBasic() error {
 	_, err := sdk.AccAddressFromBech32(msg.Creator)
 	if err != nil {
-		return errorsmod.Wrap(ErrInvalidCreatorAddress, err.Error())
+		return errors.Join(ErrInvalidCreatorAddress, err)
 	}
 
 	if msg.Id == 0 {

diff --git a/x/rollapp/types/message_update_rollapp.go b/x/rollapp/types/message_update_rollapp.go
@@ -53,7 +53,7 @@ func (msg *MsgUpdateRollappInformation) GetSignBytes() []byte {
 func (msg *MsgUpdateRollappInformation) ValidateBasic() error {
 	_, err := sdk.AccAddressFromBech32(msg.Owner)
 	if err != nil {
-		return errorsmod.Wrap(ErrInvalidCreatorAddress, err.Error())
+		return errors.Join(ErrInvalidCreatorAddress, err)
 	}
 
 	if msg.InitialSequencer != "" && msg.InitialSequencer != "*" {

diff --git a/x/rollapp/types/rollapp.go b/x/rollapp/types/rollapp.go
@@ -56,7 +56,7 @@ func (r Rollapp) LastStateUpdateHeightIsSet() bool {
 func (r Rollapp) ValidateBasic() error {
 	_, err := sdk.AccAddressFromBech32(r.Owner)
 	if err != nil {
-		return errorsmod.Wrap(ErrInvalidCreatorAddress, err.Error())
+		return errors.Join(ErrInvalidCreatorAddress, err)
 	}
 
 	// validate rollappId