diff --git a/CHANGELOG.md b/CHANGELOG.md index d6e650ae95..967e0ee88c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,3 +47,5 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Bug Fixes * Fix bug in ditribution and querying rewards + +* Moved x/provider/handler.ErrInternal to the chain-sdk/go/node/provider/v1beta4 package. diff --git a/go.mod b/go.mod index 7c939f7b32..8722909487 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( google.golang.org/grpc v1.75.0 gopkg.in/yaml.v3 v3.0.1 gotest.tools/v3 v3.5.2 - pkg.akt.dev/go v0.1.6 + pkg.akt.dev/go v0.1.9-0.20260109003838-508f70669a8c pkg.akt.dev/go/cli v0.1.4 pkg.akt.dev/go/sdl v0.1.1 ) diff --git a/go.sum b/go.sum index db778c74fa..0af0dcc445 100644 --- a/go.sum +++ b/go.sum @@ -3284,8 +3284,8 @@ nhooyr.io/websocket v1.8.11 h1:f/qXNc2/3DpoSZkHt1DQu6rj4zGC8JmkkLkWss0MgN0= nhooyr.io/websocket v1.8.11/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c= pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= -pkg.akt.dev/go v0.1.6 h1:3wkDfEMWwe4ziUfNq6wUxRFSgYsL/uYF/uZgVfdet/U= -pkg.akt.dev/go v0.1.6/go.mod h1:GUDt3iohVNbt8yW4P5Q0D05zoMs2NXaojF2ZBZgfWUQ= +pkg.akt.dev/go v0.1.9-0.20260109003838-508f70669a8c h1:e0eh3GPQ7y4IIx7Pigq2XjtScvzN96wmsfsunsjwl3s= +pkg.akt.dev/go v0.1.9-0.20260109003838-508f70669a8c/go.mod h1:GUDt3iohVNbt8yW4P5Q0D05zoMs2NXaojF2ZBZgfWUQ= pkg.akt.dev/go/cli v0.1.4 h1:wFPegnPwimWHi0v5LN6AnWZnwtwpnD6mb7Dp1HSuzlw= pkg.akt.dev/go/cli v0.1.4/go.mod h1:ZLqHZcq+D/8a27WTPYhmfCm2iGbNicWV1AwOhdspJ4Y= pkg.akt.dev/go/sdl v0.1.1 h1:3CcAqWeKouFlvUSjQMktWLDqftOjn4cBX37TRFT7BRM= diff --git a/x/provider/handler/handler_test.go b/x/provider/handler/handler_test.go index bd13daff5c..c4cbcc2728 100644 --- a/x/provider/handler/handler_test.go +++ b/x/provider/handler/handler_test.go @@ -253,8 +253,8 @@ func TestProviderDeleteExisting(t *testing.T) { res, err := suite.handler(suite.ctx, deleteMsg) require.Nil(t, res) - require.EqualError(t, err, "NOTIMPLEMENTED: "+handler.ErrInternal.Error()) - require.True(t, errors.Is(err, handler.ErrInternal)) + require.EqualError(t, err, "NOTIMPLEMENTED: "+types.ErrInternal.Error()) + require.True(t, errors.Is(err, types.ErrInternal)) t.Run("ensure event created", func(_ *testing.T) { // TODO: this should emit a ProviderDelete diff --git a/x/provider/handler/server.go b/x/provider/handler/server.go index d353df7fd2..ca74c05532 100644 --- a/x/provider/handler/server.go +++ b/x/provider/handler/server.go @@ -3,7 +3,7 @@ package handler import ( "context" - errorsmod "cosmossdk.io/errors" + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" types "pkg.akt.dev/go/node/provider/v1beta4" @@ -12,11 +12,6 @@ import ( "pkg.akt.dev/node/x/provider/keeper" ) -var ( - // ErrInternal defines registered error code for internal error - ErrInternal = errorsmod.Register(types.ModuleName, 10, "internal error") -) - type msgServer struct { provider keeper.IKeeper market mkeeper.IKeeper @@ -44,7 +39,7 @@ func (ms msgServer) CreateProvider(goCtx context.Context, msg *types.MsgCreatePr } if err := ms.provider.Create(ctx, types.Provider(*msg)); err != nil { - return nil, ErrInternal.Wrapf("err: %v", err) + return nil, types.ErrInternal.Wrapf("err: %v", err) } return &types.MsgCreateProviderResponse{}, nil @@ -65,7 +60,7 @@ func (ms msgServer) UpdateProvider(goCtx context.Context, msg *types.MsgUpdatePr } if err := ms.provider.Update(ctx, types.Provider(*msg)); err != nil { - return nil, errorsmod.Wrapf(ErrInternal, "err: %v", err) + return nil, sdkerrors.Wrapf(types.ErrInternal, "err: %v", err) } return &types.MsgUpdateProviderResponse{}, nil @@ -84,5 +79,5 @@ func (ms msgServer) DeleteProvider(goCtx context.Context, msg *types.MsgDeletePr } // TODO: cancel leases - return nil, ErrInternal.Wrap("NOTIMPLEMENTED") + return nil, types.ErrInternal.Wrap("NOTIMPLEMENTED") }