From 310a1a1f66a6aa177b95f6bafa47c0c1ea1b3146 Mon Sep 17 00:00:00 2001 From: Spoorthi Satheesha <9302666+spoo-bar@users.noreply.github.com> Date: Thu, 14 Mar 2024 13:19:34 +0000 Subject: [PATCH] fixing the sequence related implementation --- x/cwerrors/genesis.go | 3 --- x/cwerrors/keeper/sudo_errors.go | 15 ++------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/x/cwerrors/genesis.go b/x/cwerrors/genesis.go index ab53b318..e7e6542b 100644 --- a/x/cwerrors/genesis.go +++ b/x/cwerrors/genesis.go @@ -13,9 +13,6 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) if err := k.Params.Set(ctx, params); err != nil { panic(err) } - if err := k.ErrorID.Set(ctx, 0); err != nil { - panic(err) - } } // ExportGenesis exports the module genesis for the current block. diff --git a/x/cwerrors/keeper/sudo_errors.go b/x/cwerrors/keeper/sudo_errors.go index b561f1c9..a02448a5 100644 --- a/x/cwerrors/keeper/sudo_errors.go +++ b/x/cwerrors/keeper/sudo_errors.go @@ -35,7 +35,7 @@ func (k Keeper) SetError(ctx sdk.Context, sudoErr types.SudoError) error { // StoreErrorInState stores the error in the state and queues it for deletion after a certain block height func (k Keeper) StoreErrorInState(ctx sdk.Context, contractAddr sdk.AccAddress, sudoErr types.SudoError) error { // just a unique identifier for the error - errorID, err := k.getNextErrorID(ctx) + errorID, err := k.ErrorID.Next(ctx) if err != nil { return err } @@ -70,7 +70,7 @@ func (k Keeper) StoreErrorInState(ctx sdk.Context, contractAddr sdk.AccAddress, } func (k Keeper) storeErrorCallback(ctx sdk.Context, sudoErr types.SudoError) error { - errorID, err := k.getNextErrorID(ctx) + errorID, err := k.ErrorID.Next(ctx) if err != nil { return err } @@ -79,17 +79,6 @@ func (k Keeper) storeErrorCallback(ctx sdk.Context, sudoErr types.SudoError) err return nil } -func (k Keeper) getNextErrorID(ctx sdk.Context) (uint64, error) { - errorID, err := k.ErrorID.Next(ctx) - if err != nil { - return 0, err - } - if err = k.ErrorID.Set(ctx, errorID); err != nil { - return 0, err - } - return errorID, nil -} - // GetErrosByContractAddress returns all errors (in state) for a given contract address func (k Keeper) GetErrorsByContractAddress(ctx sdk.Context, contractAddress []byte) (sudoErrs []types.SudoError, err error) { rng := collections.NewPrefixedPairRange[[]byte, uint64](contractAddress)