apply new param to keeper code

cosmos · Sep 15, 2023 · 5816585 · 5816585
1 parent a6fe127
commit 5816585
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/x/ccv/consumer/keeper/throttle_retry.go b/x/ccv/consumer/keeper/throttle_retry.go
@@ -2,7 +2,6 @@ package keeper
 
 import (
  "fmt"
- "time"
 
  sdktypes "github.com/cosmos/cosmos-sdk/types"
 
@@ -44,9 +43,6 @@ import (
 // This design is implemented below, and in relay.go under SendPackets() and OnAcknowledgementPacket().
 //
 
-// Retry delay period could be implemented as a param, but 1 hour is reasonable
-const RetryDelayPeriod = time.Hour
-
 // PacketSendingPermitted returns whether the consumer is allowed to send packets
 // from the pending packets queue.
 func (k Keeper) PacketSendingPermitted(ctx sdktypes.Context) bool {
@@ -60,7 +56,7 @@ func (k Keeper) PacketSendingPermitted(ctx sdktypes.Context) bool {
  return false
  }
  // If retry delay period has elapsed, we can send again
- return ctx.BlockTime().After(record.SendTime.Add(RetryDelayPeriod))
+ return ctx.BlockTime().After(record.SendTime.Add(k.GetRetryDelayPeriod(ctx)))
 }
 
 func (k Keeper) UpdateSlashRecordOnSend(ctx sdktypes.Context) {

diff --git a/x/ccv/consumer/keeper/throttle_retry_test.go b/x/ccv/consumer/keeper/throttle_retry_test.go
@@ -7,14 +7,16 @@ import (
  "github.com/stretchr/testify/require"
 
  testutil "github.com/cosmos/interchain-security/v3/testutil/keeper"
- consumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper"
  consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
+ ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 func TestPacketSendingPermitted(t *testing.T) {
  consumerKeeper, ctx, ctrl, _ := testutil.GetConsumerKeeperAndCtx(t, testutil.NewInMemKeeperParams(t))
  defer ctrl.Finish()
 
+ consumerKeeper.SetParams(ctx, ccvtypes.DefaultParams())
+
  ctx = ctx.WithBlockTime(time.Now())
 
  // No slash record exists, send is permitted
@@ -42,7 +44,8 @@ func TestPacketSendingPermitted(t *testing.T) {
  require.False(t, consumerKeeper.PacketSendingPermitted(ctx))
 
  // Elapse retry delay period
- ctx = ctx.WithBlockTime(ctx.BlockTime().Add(2 * consumerkeeper.RetryDelayPeriod))
+ period := consumerKeeper.GetRetryDelayPeriod(ctx)
+ ctx = ctx.WithBlockTime(ctx.BlockTime().Add(2 * period))
 
  // Now packet sending is permitted again
  require.True(t, consumerKeeper.PacketSendingPermitted(ctx))