remove the gmp handler

umee-network · Apr 3, 2024 · 330efe3 · 330efe3
1 parent 5c28e71
commit 330efe3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/x/uibc/gmp/gmp_middleware.go b/x/uibc/gmp/gmp_middleware.go
@@ -7,15 +7,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-type Handler struct {
-}
-
-func NewHandler() *Handler {
-	return &Handler{}
-}
-
-func (h Handler) ParseMemo(ctx sdk.Context, coinReceived sdk.Coin, memo string, receiver sdk.AccAddress,
-) (GMPMemo, error) {
+// PaseMemo will parse the incoming gmp memo
+func ParseMemo(ctx sdk.Context, coinReceived sdk.Coin, memo string, receiver sdk.AccAddress) (GMPMemo, error) {
 	if len(memo) == 0 {
 		return GMPMemo{}, nil
 	}

diff --git a/x/uibc/gmp/gmp_middleware_test.go b/x/uibc/gmp/gmp_middleware_test.go
@@ -11,7 +11,6 @@ import (
 )
 
 func TestGmpMemoHandler(t *testing.T) {
-	gmpHandler := NewHandler()
 	logger := log.NewNopLogger()
 	ctx := sdk.NewContext(nil, tmproto.Header{}, false, logger)
 
@@ -83,7 +82,7 @@ func TestGmpMemoHandler(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			_, err := gmpHandler.ParseMemo(ctx, sdk.Coin{}, tc.memo(), nil)
+			_, err := ParseMemo(ctx, sdk.Coin{}, tc.memo(), nil)
 			if len(tc.errMsg) != 0 {
 				assert.ErrorContains(t, err, tc.errMsg)
 			} else {

diff --git a/x/uibc/uics20/memo_handler.go b/x/uibc/uics20/memo_handler.go
@@ -63,8 +63,7 @@ func (mh *MemoHandler) onRecvPacketPrepare(
 	if strings.EqualFold(ftData.Sender, gmp.DefaultGMPAddress) {
 		events = append(events, "Axelar GMP")
 		mh.isGMP = true
-		gh := gmp.NewHandler()
-		gmpMessage, err := gh.ParseMemo(*ctx, mh.received, mh.memo, mh.receiver)
+		gmpMessage, err := gmp.ParseMemo(*ctx, mh.received, mh.memo, mh.receiver)
 		if err != nil {
 			logger.Debug("Can't parse the gmp memo", "err", err)
 			return events, errMemoValidation{err}