remove old claimdeposit msg

tellor-io · Sep 4, 2024 · 8e66f4a · 8e66f4a
1 parent 36f6464
commit 8e66f4a
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 1,676 deletions.
diff --git a/api/layer/bridge/tx.pulsar.go b/api/layer/bridge/tx.pulsar.go
diff --git a/api/layer/bridge/tx_grpc.pb.go b/api/layer/bridge/tx_grpc.pb.go
diff --git a/proto/layer/bridge/tx.proto b/proto/layer/bridge/tx.proto
@@ -13,7 +13,6 @@ service Msg {
   option (cosmos.msg.v1.service) = true;
   rpc RequestAttestations(MsgRequestAttestations) returns (MsgRequestAttestationsResponse);
   rpc WithdrawTokens(MsgWithdrawTokens) returns (MsgWithdrawTokensResponse);
-  rpc ClaimDeposit(MsgClaimDepositRequest) returns (MsgClaimDepositResponse);
   rpc ClaimDeposits(MsgClaimDepositsRequest) returns (MsgClaimDepositsResponse);
 }
 
@@ -37,16 +36,6 @@ message MsgWithdrawTokens {
 
 message MsgWithdrawTokensResponse {}
 
-message MsgClaimDepositRequest {
-  option (cosmos.msg.v1.signer) = "creator";
-
-  string creator = 1;
-  uint64 deposit_id = 2;
-  uint64 index = 3;
-}
-
-message MsgClaimDepositResponse {}
-
 message MsgClaimDepositsRequest {
   option (cosmos.msg.v1.signer) = "creator";
 

diff --git a/x/bridge/autocli.go b/x/bridge/autocli.go
@@ -96,12 +96,6 @@ func (am AppModule) AutoCLIOptions() *autocliv1.ModuleOptions {
 					Short:          "Execute the WithdrawTokens RPC method",
 					PositionalArgs: []*autocliv1.PositionalArgDescriptor{{ProtoField: "creator"}, {ProtoField: "recipient"}, {ProtoField: "amount"}},
 				},
-				{
-					RpcMethod:      "ClaimDeposit",
-					Use:            "claim-deposit [creator] [deposit-id] [index]",
-					Short:          "Execute the ClaimDeposit RPC method",
-					PositionalArgs: []*autocliv1.PositionalArgDescriptor{{ProtoField: "creator"}, {ProtoField: "deposit_id"}, {ProtoField: "index"}},
-				},
 				{
 					RpcMethod:      "ClaimDeposits",
 					Use:            "claim-deposits [creator] [deposit-ids] [indices]",

diff --git a/x/bridge/keeper/msg_server_claim_deposit.go b/x/bridge/keeper/msg_server_claim_deposit.go
diff --git a/...e/keeper/msg_server_claim_deposit_test.go → .../keeper/msg_server_claim_deposits_test.go b/...e/keeper/msg_server_claim_deposit_test.go → .../keeper/msg_server_claim_deposits_test.go
@@ -17,12 +17,12 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-func TestMsgClaimDeposit(t *testing.T) {
+func TestMsgClaimDeposits(t *testing.T) {
 	k, _, bk, ok, _, _, ctx := setupKeeper(t)
 	msgServer := keeper.NewMsgServerImpl(k)
 
 	require.Panics(t, func() {
-		_, err := msgServer.ClaimDeposit(ctx, nil)
+		_, err := msgServer.ClaimDeposits(ctx, nil)
 		require.Error(t, err)
 	})
 
@@ -73,10 +73,10 @@ func TestMsgClaimDeposit(t *testing.T) {
 	depositId := uint64(0)
 	reportIndex := uint64(0)
 
-	result, err := msgServer.ClaimDeposit(sdkCtx, &bridgetypes.MsgClaimDepositRequest{
-		Creator:   msgSender.String(),
-		DepositId: depositId,
-		Index:     reportIndex,
+	result, err := msgServer.ClaimDeposits(sdkCtx, &bridgetypes.MsgClaimDepositsRequest{
+		Creator:    msgSender.String(),
+		DepositIds: []uint64{depositId},
+		Indices:    []uint64{reportIndex},
 	})
 	require.NoError(t, err)
 	require.NotNil(t, result)

diff --git a/x/bridge/types/message_claim_deposit.go b/x/bridge/types/message_claim_deposit.go
diff --git a/x/bridge/types/message_claim_deposit_test.go b/x/bridge/types/message_claim_deposit_test.go