remove unnecessary qgb dc requests + nits

celestiaorg · Jun 24, 2022 · 934a5a0 · 934a5a0
1 parent 0046603
commit 934a5a0
Show file tree

Hide file tree

Showing 7 changed files with 105 additions and 1,521 deletions.
diff --git a/proto/qgb/query.proto b/proto/qgb/query.proto
@@ -42,15 +42,6 @@ service Query {
         "/qgb/data_commitment/confirm/begin/"
         "{begin_block}/end/{end_block}/address/{address}";
   }
-  // DataCommitmentConfirmsByValidator Queries data commitment confirms by
-  // validator address
-  // FIXME can be deleted
-  rpc DataCommitmentConfirmsByValidator(
-      QueryDataCommitmentConfirmsByValidatorRequest)
-      returns (QueryDataCommitmentConfirmsByValidatorResponse) {
-    option (google.api.http).get =
-        "/qgb/data_commitment/confirms/address/{address}";
-  }
   // DataCommitmentConfirms Queries data commitment confirms by the actual
   // commitment
   rpc DataCommitmentConfirmsByCommitment(
@@ -59,14 +50,6 @@ service Query {
     option (google.api.http).get =
         "/qgb/data_commitment/confirms/commitment/{commitment}";
   }
-  // DataCommitmentConfirmsByRange Queries data commitment confirms by a block
-  // range
-  // FIXME can be deleted
-  rpc DataCommitmentConfirmsByRange(QueryDataCommitmentConfirmsByRangeRequest)
-      returns (QueryDataCommitmentConfirmsByRangeResponse) {
-    option (google.api.http).get = "/qgb/data_commitment/confirms/begin_block/"
-                                   "{begin_block}/end_block/{end_block}";
-  }
   // DataCommitmentConfirmsByExactRange Queries data commitment confirms by an
   // exact block range
   rpc DataCommitmentConfirmsByExactRange(
@@ -182,20 +165,6 @@ message QueryDataCommitmentConfirmsByCommitmentResponse {
       [ (gogoproto.nullable) = false ];
 }
 
-// QueryDataCommitmentConfirmsByRangeRequest Data commitment confirms by range
-// request
-message QueryDataCommitmentConfirmsByRangeRequest {
-  uint64 begin_block = 1;
-  uint64 end_block = 2;
-}
-
-// QueryDataCommitmentConfirmsByRangeResponse Data commitment confirms by range
-// response
-message QueryDataCommitmentConfirmsByRangeResponse {
-  repeated MsgDataCommitmentConfirm confirms = 1
-      [ (gogoproto.nullable) = false ];
-}
-
 // QueryDataCommitmentConfirmsByExactRangeRequest Data commitment confirms by
 // exact range request
 message QueryDataCommitmentConfirmsByExactRangeRequest {
@@ -210,17 +179,6 @@ message QueryDataCommitmentConfirmsByExactRangeResponse {
       [ (gogoproto.nullable) = false ];
 }
 
-// QueryDataCommitmentConfirmsByValidatorRequest Data commitment confirms by
-// validator address request
-message QueryDataCommitmentConfirmsByValidatorRequest { string address = 1; }
-
-// QueryDataCommitmentConfirmsByValidatorResponse Data commitment confirms by
-// validator address response
-message QueryDataCommitmentConfirmsByValidatorResponse {
-  repeated MsgDataCommitmentConfirm confirms = 1
-      [ (gogoproto.nullable) = false ];
-}
-
 // QueryLastUnbondingHeightRequest
 message QueryLastUnbondingHeightRequest {}
 

diff --git a/x/qgb/keeper/keeper_data_commitment_confirm.go b/x/qgb/keeper/keeper_data_commitment_confirm.go
@@ -55,60 +55,6 @@ func (k Keeper) GetDataCommitmentConfirmsByCommitment(
 	return confirms
 }
 
-// GetDataCommitmentConfirmsByValidator Returns data commitment confirms by validator address
-func (k Keeper) GetDataCommitmentConfirmsByValidator(
-	ctx sdk.Context,
-	validator sdk.AccAddress,
-) (confirms []types.MsgDataCommitmentConfirm) {
-	if err := sdk.VerifyAddressFormat(validator); err != nil {
-		ctx.Logger().Error("invalid validator address")
-		return nil
-	}
-
-	store := ctx.KVStore(k.storeKey)
-	iterator := store.Iterator(nil, nil) // Can we make this faster?
-
-	defer iterator.Close()
-
-	for ; iterator.Valid(); iterator.Next() {
-		confirm := types.MsgDataCommitmentConfirm{}
-		err := k.cdc.Unmarshal(iterator.Value(), &confirm)
-		if err != nil {
-			continue
-		}
-		if confirm.ValidatorAddress == validator.String() {
-			confirms = append(confirms, confirm)
-		}
-	}
-
-	return confirms
-}
-
-// GetDataCommitmentConfirmsByRange Returns data commitment confirms by the provided range
-func (k Keeper) GetDataCommitmentConfirmsByRange(
-	ctx sdk.Context,
-	beginBlock uint64,
-	endBlock uint64,
-) (confirms []types.MsgDataCommitmentConfirm) {
-	store := ctx.KVStore(k.storeKey)
-	iterator := store.Iterator(nil, nil) // Can we make this faster?
-
-	defer iterator.Close()
-
-	for ; iterator.Valid(); iterator.Next() {
-		confirm := types.MsgDataCommitmentConfirm{}
-		err := k.cdc.Unmarshal(iterator.Value(), &confirm)
-		if err != nil {
-			continue
-		}
-		if beginBlock <= confirm.BeginBlock && endBlock >= confirm.EndBlock {
-			confirms = append(confirms, confirm)
-		}
-	}
-
-	return confirms
-}
-
 // GetDataCommitmentConfirmsByExactRange Returns data commitment confirms by the provided exact range
 func (k Keeper) GetDataCommitmentConfirmsByExactRange(
 	ctx sdk.Context,

diff --git a/x/qgb/keeper/query_data_commitment_confirm.go b/x/qgb/keeper/query_data_commitment_confirm.go
@@ -27,22 +27,6 @@ func (k Keeper) DataCommitmentConfirm(
 	}, nil
 }
 
-func (k Keeper) DataCommitmentConfirmsByValidator(
-	ctx context.Context,
-	request *types.QueryDataCommitmentConfirmsByValidatorRequest,
-) (*types.QueryDataCommitmentConfirmsByValidatorResponse, error) {
-	addr, err := sdk.AccAddressFromBech32(request.Address)
-	if err != nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "address invalid")
-	}
-	return &types.QueryDataCommitmentConfirmsByValidatorResponse{
-		Confirms: k.GetDataCommitmentConfirmsByValidator(
-			sdk.UnwrapSDKContext(ctx),
-			addr,
-		),
-	}, nil
-}
-
 func (k Keeper) DataCommitmentConfirmsByCommitment(
 	ctx context.Context,
 	request *types.QueryDataCommitmentConfirmsByCommitmentRequest,
@@ -55,19 +39,6 @@ func (k Keeper) DataCommitmentConfirmsByCommitment(
 	}, nil
 }
 
-func (k Keeper) DataCommitmentConfirmsByRange(
-	ctx context.Context,
-	request *types.QueryDataCommitmentConfirmsByRangeRequest,
-) (*types.QueryDataCommitmentConfirmsByRangeResponse, error) {
-	return &types.QueryDataCommitmentConfirmsByRangeResponse{
-		Confirms: k.GetDataCommitmentConfirmsByRange(
-			sdk.UnwrapSDKContext(ctx),
-			request.BeginBlock,
-			request.EndBlock,
-		),
-	}, nil
-}
-
 func (k Keeper) DataCommitmentConfirmsByExactRange(
 	ctx context.Context,
 	request *types.QueryDataCommitmentConfirmsByExactRangeRequest,