From 2d46f4dad02558670bb4fd42eb6a7d07aee76027 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Fri, 15 Sep 2023 08:25:51 -0700
Subject: [PATCH] apply new param to keeper code

---
 x/ccv/consumer/keeper/throttle_retry.go      | 6 +-----
 x/ccv/consumer/keeper/throttle_retry_test.go | 7 +++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/x/ccv/consumer/keeper/throttle_retry.go b/x/ccv/consumer/keeper/throttle_retry.go
index 4c4585cb1d..7f8d85191d 100644
--- 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
index cc14ce3cdd..50157df843 100644
--- 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))