fix GetVersionedParamsWithTs Semantics to contains equal

bnb-chain · May 6, 2023 · 2e120e2 · 2e120e2
1 parent e779503
commit 2e120e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/x/storage/keeper/params.go b/x/storage/keeper/params.go
@@ -186,11 +186,12 @@ func (k Keeper) SetVersionedParamsWithTs(ctx sdk.Context, verParams types.Versio
 	return nil
 }
 
-// GetVersionedParamsWithTs find the latest params before the given time
+// GetVersionedParamsWithTs find the latest params before and equal than the specific timestamp
 func (k Keeper) GetVersionedParamsWithTs(ctx sdk.Context, ts int64) (verParams types.VersionedParams, err error) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.VersionedParamsKeyPrefix)
 
-	startKey := types.GetParamsKeyWithTimestamp(ts)
+	// ReverseIterator will exclusive end, so we increment ts by 1
+	startKey := types.GetParamsKeyWithTimestamp(ts + 1)
 	iterator := store.ReverseIterator(nil, startKey)
 	defer iterator.Close()
 	if !iterator.Valid() {

diff --git a/x/storage/keeper/params_test.go b/x/storage/keeper/params_test.go
@@ -53,8 +53,8 @@ func TestMultiVersiontParams(t *testing.T) {
 
 	require.EqualValues(t, params, k.GetParams(ctx))
 	// default params
-	require.EqualValues(t, GetVersionedParamsWithTimestamp(k, ctx, blockTimeT1+1).MaxSegmentSize, 1)
-	require.EqualValues(t, GetVersionedParamsWithTimestamp(k, ctx, blockTimeT2+1).MaxSegmentSize, 2)
-	require.EqualValues(t, GetVersionedParamsWithTimestamp(k, ctx, blockTimeT3+1).MaxSegmentSize, 3)
+	require.EqualValues(t, GetVersionedParamsWithTimestamp(k, ctx, blockTimeT1).MaxSegmentSize, 1)
+	require.EqualValues(t, GetVersionedParamsWithTimestamp(k, ctx, blockTimeT2).MaxSegmentSize, 2)
+	require.EqualValues(t, GetVersionedParamsWithTimestamp(k, ctx, blockTimeT3).MaxSegmentSize, 3)
 
 }