fix and add tests (#153)

Author: colmazia

x/feeds/keeper/calculate_test.go

@@ -54,18 +54,18 @@ func TestCalculateIntervalAndDeviation(t *testing.T) {
 }
 
 func TestSumPower(t *testing.T) {
-	require.Equal(t, int64(300000), sumPower([]types.Signal{
+	require.Equal(t, int64(1250009), sumPower([]types.Signal{
 		{
 			ID:    "crypto_price.bandusd",
 			Power: 100000,
 		},
 		{
 			ID:    "crypto_price.atomusd",
-			Power: 100000,
+			Power: 150000,
 		},
 		{
 			ID:    "crypto_price.osmousd",
-			Power: 100000,
+			Power: 1000009,
 		},
 	}))
 }

x/feeds/keeper/genesis_test.go

@@ -54,6 +54,7 @@ func (suite *KeeperTestSuite) TestExportGenesis() {
 
 func (suite *KeeperTestSuite) TestInitGenesis() {
 	ctx := suite.ctx
+	params := types.NewParams("[NOT_SET]", 30, 30, 60, 3600, 1000_000_000, 100, 30, 5, 300, 256, 28800)
 
 	delegatorSignals := []types.DelegatorSignals{
 		{
@@ -86,11 +87,12 @@ func (suite *KeeperTestSuite) TestInitGenesis() {
 
 	g := types.DefaultGenesisState()
 	g.DelegatorSignals = delegatorSignals
+	g.Params = params
 
 	suite.feedsKeeper.InitGenesis(suite.ctx, *g)
 
 	suite.Require().Equal(types.DefaultPriceService(), suite.feedsKeeper.GetPriceService(ctx))
-	suite.Require().Equal(types.DefaultParams(), suite.feedsKeeper.GetParams(ctx))
+	suite.Require().Equal(params, suite.feedsKeeper.GetParams(ctx))
 	for _, ds := range delegatorSignals {
 		suite.Require().
 			Equal(ds.Signals, suite.feedsKeeper.GetDelegatorSignals(ctx, sdk.MustAccAddressFromBech32(ds.Delegator)))

x/feeds/keeper/grpc_query_test.go

@@ -136,16 +136,6 @@ func (suite *KeeperTestSuite) TestQueryPrice() {
 	}
 	suite.feedsKeeper.SetPrice(ctx, price)
 
-	valPrice := types.ValidatorPrice{
-		PriceStatus: types.PriceStatusAvailable,
-		Validator:   ValidValidator.String(),
-		SignalID:    "crypto_price.bandusd",
-		Price:       1e9,
-		Timestamp:   ctx.BlockTime().Unix(),
-	}
-	err := suite.feedsKeeper.SetValidatorPrice(ctx, valPrice)
-	suite.Require().NoError(err)
-
 	// query and check
 	res, err := queryClient.Price(gocontext.Background(), &types.QueryPriceRequest{
 		SignalId: "crypto_price.bandusd",

x/feeds/keeper/keeper_price_test.go

@@ -129,6 +129,13 @@ func (suite *KeeperTestSuite) TestCalculatePrice() {
 			Price:       2000,
 			Timestamp:   ctx.BlockTime().Unix(),
 		},
+		{
+			PriceStatus: types.PriceStatusAvailable,
+			Validator:   ValidValidator3.String(),
+			SignalID:    "crypto_price.bandusd",
+			Price:       2000,
+			Timestamp:   ctx.BlockTime().Unix(),
+		},
 	})
 	suite.Require().NoError(err)
 

x/feeds/keeper/keeper_signal.go

@@ -97,12 +97,6 @@ func (k Keeper) SetSignalTotalPowers(ctx sdk.Context, signalTotalPowersList []ty
 	}
 }
 
-func (k Keeper) DeleteSignalTotalPower(ctx sdk.Context, signalTotalPower types.Signal) {
-	k.DeletePrice(ctx, signalTotalPower.ID)
-	k.deleteSignalTotalPowerByPowerIndex(ctx, signalTotalPower)
-	ctx.KVStore(k.storeKey).Delete(types.SignalTotalPowerStoreKey(signalTotalPower.ID))
-}
-
 func (k Keeper) setSignalTotalPowerByPowerIndex(ctx sdk.Context, signalTotalPower types.Signal) {
 	ctx.KVStore(k.storeKey).
 		Set(types.SignalTotalPowerByPowerIndexKey(signalTotalPower.ID, signalTotalPower.Power), []byte(signalTotalPower.ID))

x/feeds/keeper/keeper_test.go

@@ -22,12 +22,13 @@ import (
 )
 
 var (
-	ValidValidator   = sdk.ValAddress("1234567890")
-	ValidValidator2  = sdk.ValAddress("2345678901")
-	ValidDelegator   = sdk.AccAddress("3456789012")
-	ValidDelegator2  = sdk.AccAddress("4567890123")
-	InvalidValidator = sdk.ValAddress("9876543210")
-	InvalidDelegator = sdk.AccAddress("8765432109")
+	ValidValidator   = sdk.ValAddress("1000000001")
+	ValidValidator2  = sdk.ValAddress("1000000002")
+	ValidValidator3  = sdk.ValAddress("1000000003")
+	ValidDelegator   = sdk.AccAddress("2000000001")
+	ValidDelegator2  = sdk.AccAddress("2000000002")
+	InvalidValidator = sdk.ValAddress("9000000001")
+	InvalidDelegator = sdk.AccAddress("9000000002")
 )
 
 type KeeperTestSuite struct {
@@ -63,6 +64,10 @@ func (suite *KeeperTestSuite) SetupTest() {
 		GetValidatorStatus(gomock.Any(), gomock.Eq(ValidValidator2)).
 		Return(oracletypes.NewValidatorStatus(true, suite.ctx.BlockHeader().Time)).
 		AnyTimes()
+	oracleKeeper.EXPECT().
+		GetValidatorStatus(gomock.Any(), gomock.Eq(ValidValidator3)).
+		Return(oracletypes.NewValidatorStatus(true, suite.ctx.BlockHeader().Time)).
+		AnyTimes()
 	oracleKeeper.EXPECT().
 		GetValidatorStatus(gomock.Any(), gomock.Eq(InvalidValidator)).
 		Return(oracletypes.NewValidatorStatus(false, suite.ctx.BlockHeader().Time)).
@@ -78,6 +83,10 @@ func (suite *KeeperTestSuite) SetupTest() {
 		GetValidator(gomock.Any(), gomock.Eq(ValidValidator2)).
 		Return(stakingtypes.Validator{Status: stakingtypes.Bonded}, true).
 		AnyTimes()
+	stakingKeeper.EXPECT().
+		GetValidator(gomock.Any(), gomock.Eq(ValidValidator3)).
+		Return(stakingtypes.Validator{Status: stakingtypes.Bonded}, true).
+		AnyTimes()
 	stakingKeeper.EXPECT().
 		GetValidator(gomock.Any(), gomock.Eq(InvalidValidator)).
 		Return(stakingtypes.Validator{Status: stakingtypes.Unbonded}, true).
@@ -94,6 +103,10 @@ func (suite *KeeperTestSuite) SetupTest() {
 					OperatorAddress: ValidValidator2.String(),
 					Tokens:          sdk.NewInt(3000),
 				},
+				{
+					OperatorAddress: ValidValidator3.String(),
+					Tokens:          sdk.NewInt(3000),
+				},
 			}
 
 			for i, val := range vals {

x/feeds/types/median_test.go

@@ -36,6 +36,16 @@ func TestCalculateMedianPriceFeedInfo(t *testing.T) {
 			},
 			expRes: 109,
 		},
+		{
+			name: "case 3",
+			priceFeedInfos: []types.PriceFeedInfo{
+				{Price: 1000, Deviation: 0, Power: 5000, Timestamp: 1716448424, Index: 0},
+				{Price: 2000, Deviation: 0, Power: 4000, Timestamp: 1716448424, Index: 1},
+				{Price: 2000, Deviation: 0, Power: 4000, Timestamp: 1716448424, Index: 2},
+				{Price: 2000, Deviation: 0, Power: 4000, Timestamp: 1716448424, Index: 3},
+			},
+			expRes: 1000,
+		},
 	}
 
 	for _, tc := range testCases {