From 8da542feb97518b0df768b1edbf2400ccb4df678 Mon Sep 17 00:00:00 2001 From: Damian Nolan Date: Fri, 5 Aug 2022 14:20:22 +0200 Subject: [PATCH] updating tests and legacy code --- modules/core/02-client/legacy/v100/store.go | 5 +---- modules/light-clients/07-tendermint/update_test.go | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/core/02-client/legacy/v100/store.go b/modules/core/02-client/legacy/v100/store.go index b59f512f92d..e83b116c956 100644 --- a/modules/core/02-client/legacy/v100/store.go +++ b/modules/core/02-client/legacy/v100/store.go @@ -96,10 +96,7 @@ func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Binar // add iteration keys so pruning will be successful addConsensusMetadata(ctx, clientStore) - if err = ibctm.PruneAllExpiredConsensusStates(ctx, clientStore, cdc, tmClientState); err != nil { - return err - } - + ibctm.PruneAllExpiredConsensusStates(ctx, clientStore, cdc, tmClientState) default: continue } diff --git a/modules/light-clients/07-tendermint/update_test.go b/modules/light-clients/07-tendermint/update_test.go index 306133542b5..0b5b55eb1cc 100644 --- a/modules/light-clients/07-tendermint/update_test.go +++ b/modules/light-clients/07-tendermint/update_test.go @@ -488,8 +488,7 @@ func (suite *TendermintTestSuite) TestPruneConsensusState() { } ctx := path.EndpointA.Chain.GetContext() clientStore := path.EndpointA.Chain.App.GetIBCKeeper().ClientKeeper.ClientStore(ctx, path.EndpointA.ClientID) - err := ibctm.IterateConsensusStateAscending(clientStore, getFirstHeightCb) - suite.Require().Nil(err) + ibctm.IterateConsensusStateAscending(clientStore, getFirstHeightCb) // this height will be expired but not pruned path.EndpointA.UpdateClient()