Remove CompletedOutgoingTxs from unsigned batch and contract calls lo…

…okups
PeggyJV · Feb 8, 2024 · 2d24648 · 2d24648
1 parent 8a21caf
commit 2d24648
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 23 deletions.
diff --git a/module/x/gravity/keeper/batch.go b/module/x/gravity/keeper/batch.go
@@ -163,17 +163,6 @@ func (k Keeper) getLastOutgoingBatchByTokenType(ctx sdk.Context, token common.Ad
 // GetUnsignedBatchTxs returns all batches for which the specified validator has not submitted confirmations in ascending nonce order
 func (k Keeper) GetUnsignedBatchTxs(ctx sdk.Context, val sdk.ValAddress) []*types.BatchTx {
 	var unconfirmed []*types.BatchTx
-	k.IterateCompletedOutgoingTxsByType(ctx, types.BatchTxPrefixByte, func(_ []byte, cotx types.OutgoingTx) bool {
-		sig := k.getEthereumSignature(ctx, cotx.GetStoreIndex(), val)
-		if len(sig) == 0 {
-			batch, ok := cotx.(*types.BatchTx)
-			if !ok {
-				panic(sdkerrors.Wrapf(types.ErrInvalid, "couldn't cast to batch tx for completed tx %s", cotx))
-			}
-			unconfirmed = append(unconfirmed, batch)
-		}
-		return false
-	})
 	k.IterateOutgoingTxsByType(ctx, types.BatchTxPrefixByte, func(_ []byte, otx types.OutgoingTx) bool {
 		sig := k.getEthereumSignature(ctx, otx.GetStoreIndex(), val)
 		if len(sig) == 0 {

diff --git a/module/x/gravity/keeper/contract_call.go b/module/x/gravity/keeper/contract_call.go
@@ -12,18 +12,6 @@ import (
 
 func (k Keeper) GetUnsignedContractCallTxs(ctx sdk.Context, val sdk.ValAddress) []*types.ContractCallTx {
 	var unconfirmed []*types.ContractCallTx
-	k.IterateCompletedOutgoingTxsByType(ctx, types.ContractCallTxPrefixByte, func(_ []byte, cotx types.OutgoingTx) bool {
-		sig := k.getEthereumSignature(ctx, cotx.GetStoreIndex(), val)
-		if len(sig) == 0 {
-			call, ok := cotx.(*types.ContractCallTx)
-			if !ok {
-				panic(sdkerrors.Wrapf(types.ErrInvalid, "couldn't cast to contract call for completed tx %s", cotx))
-			}
-			unconfirmed = append(unconfirmed, call)
-		}
-		return false
-	})
-
 	k.IterateOutgoingTxsByType(ctx, types.ContractCallTxPrefixByte, func(_ []byte, otx types.OutgoingTx) bool {
 		sig := k.getEthereumSignature(ctx, otx.GetStoreIndex(), val)
 		if len(sig) == 0 {