further test in AccumulatorPositionStore

sunriselayer · Jul 8, 2024 · cb81ace · cb81ace
1 parent 858688b
commit cb81ace
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 51 deletions.
diff --git a/x/liquiditypool/keeper/accumulator_test.go b/x/liquiditypool/keeper/accumulator_test.go
@@ -20,7 +20,6 @@ import (
 // TODO: add test for DeletePosition
 // TODO: add test for deletePosition
 // TODO: add test for GetAccumulatorPositionSize
-// TODO: add test for HasPosition
 // TODO: add test for ClaimRewards
 // TODO: add test for AddToUnclaimedRewards
 // TODO: add test for GetTotalRewards
@@ -70,47 +69,44 @@ func TestAccumulatorStore(t *testing.T) {
 func TestAccumulatorPositionStore(t *testing.T) {
 	k, _, ctx := keepertest.LiquiditypoolKeeper(t)
 
+	// Get not available position
+	_, err := k.GetAccumulatorPosition(ctx, "accumulator", "index")
+	require.Error(t, err)
+	hasPosition := k.HasPosition(ctx, "accumulator", "index")
+	require.False(t, hasPosition)
+
 	accmulatorValuePerShare := sdk.NewDecCoins(sdk.NewDecCoin("denom", math.NewInt(1)))
 	unclaimedRewardsTotal := sdk.NewDecCoins(sdk.NewDecCoin("denom", math.NewInt(2)))
 	k.SetAccumulatorPosition(ctx, "accumulator", accmulatorValuePerShare, "index", math.LegacyOneDec(), unclaimedRewardsTotal)
 	position, err := k.GetAccumulatorPosition(ctx, "accumulator", "index")
 	require.NoError(t, err)
-	require.Equal(t, position.Name, "accumulator1")
-	require.Equal(t, position.Index, "")
-	require.Equal(t, position.NumShares.String(), "0.000000000000000000")
-	require.Equal(t, position.AccumValuePerShare.String(), "accumulator1")
-	require.Equal(t, position.UnclaimedRewardsTotal.String(), "accumulator1")
-
-	// accumulator, err := k.GetAccumulator(ctx, "accumulator1")
-	// require.NoError(t, err)
-	// require.Equal(t, accumulator.Name, "accumulator1")
-	// require.Equal(t, accumulator.AccumValue.String(), "")
-	// require.Equal(t, accumulator.TotalShares.String(), "0.000000000000000000")
-
-	// accumulator, err = k.GetAccumulator(ctx, "accumulator2")
-	// require.NoError(t, err)
-	// require.Equal(t, accumulator.Name, "accumulator2")
-	// require.Equal(t, accumulator.AccumValue.String(), "")
-	// require.Equal(t, accumulator.TotalShares.String(), "0.000000000000000000")
-
-	// k.AddToAccumulator(ctx, accumulator, sdk.NewDecCoins(sdk.NewDecCoin("denom", math.NewInt(100))))
-	// accumulator, err = k.GetAccumulator(ctx, "accumulator2")
-	// require.NoError(t, err)
-	// require.Equal(t, accumulator.Name, "accumulator2")
-	// require.Equal(t, accumulator.AccumValue.String(), "100.000000000000000000denom")
-	// require.Equal(t, accumulator.TotalShares.String(), "0.000000000000000000")
-
-	// accumulator.AccumValue = sdk.NewDecCoins(sdk.NewDecCoin("denom", math.NewInt(1)))
-	// err = k.SetAccumulator(ctx, accumulator)
-	// require.NoError(t, err)
-	// accumulator, err = k.GetAccumulator(ctx, "accumulator2")
-	// require.NoError(t, err)
-	// require.Equal(t, accumulator.Name, "accumulator2")
-	// require.Equal(t, accumulator.AccumValue.String(), "1.000000000000000000denom")
-
-	// _, err = k.GetAccumulator(ctx, "accumulator3")
-	// require.Error(t, err)
+	require.Equal(t, position.Name, "accumulator")
+	require.Equal(t, position.Index, "index")
+	require.Equal(t, position.NumShares.String(), "1.000000000000000000")
+	require.Equal(t, position.AccumValuePerShare.String(), "1.000000000000000000denom")
+	require.Equal(t, position.UnclaimedRewardsTotal.String(), "2.000000000000000000denom")
+
+	k.SetAccumulatorPosition(ctx, "accumulator", accmulatorValuePerShare, "index2", math.LegacyOneDec(), unclaimedRewardsTotal)
+	position, err = k.GetAccumulatorPosition(ctx, "accumulator", "index2")
+	require.NoError(t, err)
+	require.Equal(t, position.Name, "accumulator")
+	require.Equal(t, position.Index, "index2")
+	require.Equal(t, position.NumShares.String(), "1.000000000000000000")
+	require.Equal(t, position.AccumValuePerShare.String(), "1.000000000000000000denom")
+	require.Equal(t, position.UnclaimedRewardsTotal.String(), "2.000000000000000000denom")
+
+	k.SetAccumulatorPosition(ctx, "accumulator2", accmulatorValuePerShare, "index", math.LegacyOneDec(), unclaimedRewardsTotal)
+	position, err = k.GetAccumulatorPosition(ctx, "accumulator2", "index")
+	require.NoError(t, err)
+	require.Equal(t, position.Name, "accumulator2")
+	require.Equal(t, position.Index, "index")
+	require.Equal(t, position.NumShares.String(), "1.000000000000000000")
+	require.Equal(t, position.AccumValuePerShare.String(), "1.000000000000000000denom")
+	require.Equal(t, position.UnclaimedRewardsTotal.String(), "2.000000000000000000denom")
+
+	hasPosition = k.HasPosition(ctx, "accumulator2", "index")
+	require.True(t, hasPosition)
 
 	positions := k.GetAllAccumulatorPositions(ctx)
-	require.Len(t, positions, 2)
+	require.Len(t, positions, 3)
 }
diff --git a/x/swap/keeper/outgoing_in_flight_packet.go b/x/swap/keeper/outgoing_in_flight_packet.go
@@ -27,13 +27,7 @@ func (k Keeper) GetOutgoingInFlightPacket(
 	storeAdapter := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx))
 	store := prefix.NewStore(storeAdapter, types.KeyPrefix(types.OutgoingInFlightPacketKeyPrefix))
 
-	b := store.Get(types.OutgoingInFlightPacketKey(
-		types.NewPacketIndex(
-			srcPortId,
-			srcChannelId,
-			sequence,
-		),
-	))
+	b := store.Get(types.OutgoingInFlightPacketKey(types.NewPacketIndex(srcPortId, srcChannelId, sequence)))
 	if b == nil {
 		return val, false
 	}
@@ -51,13 +45,7 @@ func (k Keeper) RemoveOutgoingInFlightPacket(
 ) {
 	storeAdapter := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx))
 	store := prefix.NewStore(storeAdapter, types.KeyPrefix(types.OutgoingInFlightPacketKeyPrefix))
-	store.Delete(types.OutgoingInFlightPacketKey(
-		types.NewPacketIndex(
-			srcPortId,
-			srcChannelId,
-			sequence,
-		),
-	))
+	store.Delete(types.OutgoingInFlightPacketKey(types.NewPacketIndex(srcPortId, srcChannelId, sequence)))
 }
 
 // OutgoingInFlightPackets returns all outgoingInFlightPacket