-
Notifications
You must be signed in to change notification settings - Fork 586
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: update protos, grpc queries (#488)
- Loading branch information
1 parent
67bd594
commit 405f193
Showing
9 changed files
with
323 additions
and
2,159 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,65 @@ | ||
| package keeper | ||
|
|
||
| // TODO | ||
| import ( | ||
| "context" | ||
|
|
||
| //var _ types.QueryServer = Keeper{} | ||
| "google.golang.org/grpc/codes" | ||
| "google.golang.org/grpc/status" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/store/prefix" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" | ||
| "github.com/cosmos/cosmos-sdk/types/query" | ||
|
|
||
| "github.com/cosmos/ibc-go/modules/apps/29-fee/types" | ||
| ) | ||
|
|
||
| var _ types.QueryServer = Keeper{} | ||
|
|
||
| // IncentivizedPackets implements the IncentivizedPackets gRPC method | ||
| func (k Keeper) IncentivizedPackets(c context.Context, req *types.QueryIncentivizedPacketsRequest) (*types.QueryIncentivizedPacketsResponse, error) { | ||
| if req == nil { | ||
| return nil, status.Error(codes.InvalidArgument, "empty request") | ||
| } | ||
|
|
||
| ctx := sdk.UnwrapSDKContext(c).WithBlockHeight(int64(req.QueryHeight)) | ||
|
|
||
| var packets []*types.IdentifiedPacketFee | ||
| store := prefix.NewStore(ctx.KVStore(k.storeKey), []byte(types.FeeInEscrowPrefix)) | ||
| _, err := query.Paginate(store, req.Pagination, func(_, value []byte) error { | ||
| result := k.MustUnmarshalFee(value) | ||
| packets = append(packets, &result) | ||
| return nil | ||
| }) | ||
|
|
||
| if err != nil { | ||
| return nil, status.Error( | ||
| codes.NotFound, err.Error(), | ||
| ) | ||
| } | ||
|
|
||
| return &types.QueryIncentivizedPacketsResponse{ | ||
| IncentivizedPackets: packets, | ||
| }, nil | ||
| } | ||
|
|
||
| // IncentivizedPacket implements the IncentivizedPacket gRPC method | ||
| func (k Keeper) IncentivizedPacket(c context.Context, req *types.QueryIncentivizedPacketRequest) (*types.QueryIncentivizedPacketResponse, error) { | ||
| if req == nil { | ||
| return nil, status.Error(codes.InvalidArgument, "empty request") | ||
| } | ||
|
|
||
| ctx := sdk.UnwrapSDKContext(c).WithBlockHeight(int64(req.QueryHeight)) | ||
|
|
||
| fee, exists := k.GetFeeInEscrow(ctx, req.PacketId) | ||
| if !exists { | ||
| return nil, status.Error( | ||
| codes.NotFound, | ||
| sdkerrors.Wrap(types.ErrFeeNotFound, req.PacketId.String()).Error(), | ||
| ) | ||
| } | ||
|
|
||
| return &types.QueryIncentivizedPacketResponse{ | ||
| IncentivizedPacket: &fee, | ||
| }, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| package keeper_test | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| "github.com/cosmos/cosmos-sdk/types/query" | ||
|
|
||
| "github.com/cosmos/ibc-go/modules/apps/29-fee/types" | ||
| ibctesting "github.com/cosmos/ibc-go/testing" | ||
| ) | ||
|
|
||
| func (suite *KeeperTestSuite) TestQueryIncentivizedPacket() { | ||
|
|
||
| var ( | ||
| req *types.QueryIncentivizedPacketRequest | ||
| ) | ||
|
|
||
| // setup | ||
| validPacketId := types.NewPacketId(ibctesting.FirstChannelID, 1) | ||
| invalidPacketId := types.NewPacketId(ibctesting.FirstChannelID, 2) | ||
| identifiedPacketFee := types.NewIdentifiedPacketFee( | ||
| validPacketId, | ||
| types.Fee{ | ||
| AckFee: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100))), | ||
| ReceiveFee: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100))), | ||
| TimeoutFee: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100))), | ||
| }, | ||
| []string(nil), | ||
| ) | ||
|
|
||
| testCases := []struct { | ||
| name string | ||
| malleate func() | ||
| expPass bool | ||
| }{ | ||
| { | ||
| "success", | ||
| func() { | ||
| req = &types.QueryIncentivizedPacketRequest{ | ||
| PacketId: validPacketId, | ||
| QueryHeight: 0, | ||
| } | ||
| }, | ||
| true, | ||
| }, | ||
| { | ||
| "packetId not found", | ||
| func() { | ||
| req = &types.QueryIncentivizedPacketRequest{ | ||
| PacketId: invalidPacketId, | ||
| QueryHeight: 0, | ||
| } | ||
| }, | ||
| false, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range testCases { | ||
| suite.Run(tc.name, func() { | ||
| suite.SetupTest() // reset | ||
|
|
||
| refundAcc := suite.chainA.SenderAccount.GetAddress() | ||
|
|
||
| tc.malleate() | ||
| ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) | ||
| suite.chainA.GetSimApp().IBCFeeKeeper.EscrowPacketFee(suite.chainA.GetContext(), refundAcc, identifiedPacketFee) | ||
| res, err := suite.queryClient.IncentivizedPacket(ctx, req) | ||
|
|
||
| if tc.expPass { | ||
| suite.Require().NoError(err) | ||
| suite.Require().NotNil(res) | ||
| suite.Require().Equal(identifiedPacketFee, res.IncentivizedPacket) | ||
| } else { | ||
| suite.Require().Error(err) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func (suite *KeeperTestSuite) TestQueryIncentivizedPackets() { | ||
| var ( | ||
| req *types.QueryIncentivizedPacketsRequest | ||
| expPackets []*types.IdentifiedPacketFee | ||
| ) | ||
|
|
||
| fee := types.Fee{ | ||
| AckFee: sdk.Coins{sdk.Coin{Denom: sdk.DefaultBondDenom, Amount: sdk.NewInt(100)}}, | ||
| ReceiveFee: sdk.Coins{sdk.Coin{Denom: sdk.DefaultBondDenom, Amount: sdk.NewInt(100)}}, | ||
| TimeoutFee: sdk.Coins{sdk.Coin{Denom: sdk.DefaultBondDenom, Amount: sdk.NewInt(100)}}, | ||
| } | ||
|
|
||
| testCases := []struct { | ||
| msg string | ||
| malleate func() | ||
| expPass bool | ||
| }{ | ||
| { | ||
| "empty pagination", | ||
| func() { | ||
| req = &types.QueryIncentivizedPacketsRequest{} | ||
| }, | ||
| true, | ||
| }, | ||
| { | ||
| "success", | ||
| func() { | ||
| refundAcc := suite.chainA.SenderAccount.GetAddress() | ||
|
|
||
| fee1 := types.NewIdentifiedPacketFee(types.NewPacketId(ibctesting.FirstChannelID, 1), fee, []string(nil)) | ||
| fee2 := types.NewIdentifiedPacketFee(types.NewPacketId(ibctesting.FirstChannelID, 2), fee, []string(nil)) | ||
| fee3 := types.NewIdentifiedPacketFee(types.NewPacketId(ibctesting.FirstChannelID, 3), fee, []string(nil)) | ||
|
|
||
| expPackets = []*types.IdentifiedPacketFee{} | ||
| expPackets = append(expPackets, fee1, fee2, fee3) | ||
|
|
||
| for _, p := range expPackets { | ||
| suite.chainA.GetSimApp().IBCFeeKeeper.EscrowPacketFee(suite.chainA.GetContext(), refundAcc, p) | ||
| } | ||
|
|
||
| req = &types.QueryIncentivizedPacketsRequest{ | ||
| Pagination: &query.PageRequest{ | ||
| Limit: 5, | ||
| CountTotal: false, | ||
| }, | ||
| QueryHeight: 0, | ||
| } | ||
| }, | ||
| true, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range testCases { | ||
| suite.Run(fmt.Sprintf("Case %s", tc.msg), func() { | ||
| suite.SetupTest() // reset | ||
| tc.malleate() | ||
| ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) | ||
|
|
||
| res, err := suite.queryClient.IncentivizedPackets(ctx, req) | ||
|
|
||
| if tc.expPass { | ||
| suite.Require().NoError(err) | ||
| suite.Require().NotNil(res) | ||
| fmt.Println(expPackets) | ||
| suite.Require().Equal(expPackets, res.IncentivizedPackets) | ||
| } else { | ||
| suite.Require().Error(err) | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.