From f1a797510d90375633e330e498ba92eb405b1323 Mon Sep 17 00:00:00 2001
From: danwt <30197399+danwt@users.noreply.github.com>
Date: Tue, 5 Nov 2024 12:28:19 +0000
Subject: [PATCH] done

---
 x/lightclient/keeper/keeper.go      | 43 ++---------------------------
 x/lightclient/keeper/keeper_test.go |  2 +-
 2 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/x/lightclient/keeper/keeper.go b/x/lightclient/keeper/keeper.go
index 320c3110e..4b1eea520 100644
--- a/x/lightclient/keeper/keeper.go
+++ b/x/lightclient/keeper/keeper.go
@@ -96,10 +96,10 @@ func (k Keeper) CanUnbond(ctx sdk.Context, seq sequencertypes.Sequencer) error {
 	})
 }
 
-// PruneSigners removes bookkeeping for all heights ABOVE h for given rollapp
+// PruneSignersAbove removes bookkeeping for all heights ABOVE h for given rollapp
 // This should only be called after canonical client set
 // TODO: plug into hard fork
-func (k Keeper) PruneSigners(ctx sdk.Context, rollapp string, h uint64) error {
+func (k Keeper) PruneSignersAbove(ctx sdk.Context, rollapp string, h uint64) error {
 	client, ok := k.GetCanonicalClient(ctx, rollapp)
 	if !ok {
 		return gerrc.ErrInternal.Wrap(`
@@ -130,10 +130,7 @@ shouldnt be allowed
 	return nil
 }
 
-// func (p *PairRange[K1, K2])
-type Foo[K1, K2 any] func(p *collections.PairRange[K1, K2], k2 K2) *collections.PairRange[K1, K2]
-
-// PruneSignersBelow PruneSigners removes bookkeeping for all heights BELOW h for given rollapp
+// PruneSignersBelow removes bookkeeping for all heights BELOW h for given rollapp
 // This should only be called after canonical client set
 func (k Keeper) PruneSignersBelow(ctx sdk.Context, rollapp string, h uint64) error {
 	client, ok := k.GetCanonicalClient(ctx, rollapp)
@@ -166,40 +163,6 @@ shouldnt be allowed
 	return nil
 }
 
-// PruneSignersBelow PruneSigners removes bookkeeping for all heights BELOW h for given rollapp
-// This should only be called after canonical client set
-func (k Keeper) PruneGeneric(ctx sdk.Context, rollapp string, h uint64, f Foo[string, uint64]) error {
-	client, ok := k.GetCanonicalClient(ctx, rollapp)
-	if !ok {
-		return gerrc.ErrInternal.Wrap(`
-prune light client signers for rollapp before canonical client is set
-this suggests fork happened prior to genesis bridge completion, which
-shouldnt be allowed
-`)
-	}
-	//rng := collections.NewPrefixedPairRange[string, uint64](client)
-	rng := f(collections.NewPrefixedPairRange[string, uint64](client), h)
-
-	seqs := make([]string, 0)
-	heights := make([]uint64, 0)
-
-	// collect first to avoid del while iterating
-	if err := k.clientHeightToSigner.Walk(ctx, rng, func(key collections.Pair[string, uint64], value string) (stop bool, err error) {
-		seqs = append(seqs, value)
-		heights = append(heights, key.K2())
-		return false, nil
-	}); err != nil {
-		return errorsmod.Wrap(err, "walk signers")
-	}
-
-	for i := 0; i < len(seqs); i++ {
-		if err := k.RemoveSigner(ctx, seqs[i], client, heights[i]); err != nil {
-			return errorsmod.Wrap(err, "remove signer")
-		}
-	}
-	return nil
-}
-
 // GetSigner returns the sequencer address who signed the header in the update
 func (k Keeper) GetSigner(ctx sdk.Context, client string, h uint64) (string, error) {
 	return k.clientHeightToSigner.Get(ctx, collections.Join(client, h))
diff --git a/x/lightclient/keeper/keeper_test.go b/x/lightclient/keeper/keeper_test.go
index d6e5e0021..ea5c59758 100644
--- a/x/lightclient/keeper/keeper_test.go
+++ b/x/lightclient/keeper/keeper_test.go
@@ -56,7 +56,7 @@ func (s *TestSuite) TestUnbondConditionFlow() {
 	utest.IsErr(s.Require(), err, sequencertypes.ErrUnbondNotAllowed)
 
 	// we prune some, but still not allowed
-	err = s.k().PruneSigners(s.Ctx, seq.RollappId, 6)
+	err = s.k().PruneSignersAbove(s.Ctx, seq.RollappId, 6)
 	s.Require().NoError(err)
 
 	err = s.k().CanUnbond(s.Ctx, seq)