removed unused functions, renamed other functions

neutron-org · Dec 19, 2024 · b4bb189 · b4bb189
1 parent 0935c09
commit b4bb189
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/x/tokenfactory/keeper/bankactions.go b/x/tokenfactory/keeper/bankactions.go
@@ -50,7 +50,7 @@ func (k Keeper) burnFrom(ctx sdk.Context, amount sdk.Coin, burnFrom string) erro
 		return status.Errorf(codes.Internal, "burning from module accounts is forbidden")
 	}
 
-	escrowAccounts := k.GetAllEscrowAccounts(ctx)
+	escrowAccounts := k.GetAllIBCEscrowAccounts(ctx)
 
 	if _, ok := escrowAccounts[burnFromAcc.String()]; ok {
 		return status.Errorf(codes.Internal, "burning from escrow accounts is forbidden")
@@ -92,7 +92,7 @@ func (k Keeper) forceTransfer(ctx sdk.Context, amount sdk.Coin, fromAddr, toAddr
 		return status.Errorf(codes.Internal, "force transfer to module accounts is forbidden")
 	}
 
-	escrowAccounts := k.GetAllEscrowAccounts(ctx)
+	escrowAccounts := k.GetAllIBCEscrowAccounts(ctx)
 
 	if _, ok := escrowAccounts[transferFromAcc.String()]; ok {
 		return status.Errorf(codes.Internal, "force transfer from IBC escrow accounts is forbidden")
@@ -119,13 +119,3 @@ func (k Keeper) isModuleAccount(ctx sdk.Context, addr sdk.AccAddress) bool {
 
 	return false
 }
-
-func (k Keeper) isEscrowAccount(escrowAccounts []sdk.AccAddress, addr sdk.AccAddress) bool {
-	for _, escrowAccount := range escrowAccounts {
-		if escrowAccount.Equals(addr) {
-			return true
-		}
-	}
-
-	return false
-}
diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go
@@ -102,7 +102,7 @@ func (k Keeper) CreateModuleAccount(ctx sdk.Context) {
 	k.accountKeeper.GetModuleAccount(ctx, types.ModuleName)
 }
 
-func (k Keeper) GetAllEscrowAccounts(ctx sdk.Context) map[string]bool {
+func (k Keeper) GetAllIBCEscrowAccounts(ctx sdk.Context) map[string]bool {
 	escrowAddresses := make(map[string]bool)
 
 	transferChannels := k.channelKeeper.GetAllChannels(ctx)