Merge branch 'main' into feature/e2e

irisnet · Nov 28, 2024 · aa5d1dd · aa5d1dd
2 parents bfb3b05 + 6bbbf8c
commit aa5d1dd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/modules/farm/depinject.go b/modules/farm/depinject.go
@@ -47,7 +47,7 @@ type Inputs struct {
 
 	AccountKeeper  types.AccountKeeper
 	BankKeeper     types.BankKeeper
-	DistrKeeper    types.DistrKeeper `optional:"true"`
+	DistrKeeper    types.DistrKeeper
 	GovKeeper      types.GovKeeper
 	CoinswapKeeper types.CoinswapKeeper
 

diff --git a/modules/farm/simulation/genesis.go b/modules/farm/simulation/genesis.go
@@ -30,16 +30,12 @@ func RandomizedGenState(simState *module.SimulationState) {
 		func(r *rand.Rand) { createPoolFee = math.NewInt(5000) },
 	)
 
-	simState.AppParams.GetOrGenerate(
-		PoolCreationFee, &createPoolFee, simState.Rand,
-		func(r *rand.Rand) { taxRate = math.LegacyNewDecWithPrec(4, 1) },
-	)
-
 	simState.AppParams.GetOrGenerate(
 		MaxRewardCategoryN, &maxRewardCategoryN, simState.Rand,
 		func(r *rand.Rand) { maxRewardCategoryN = 2 },
 	)
 
+	taxRate = math.LegacyNewDecWithPrec(4, 1)
 	farmPoolGenesis := types.NewGenesisState(
 		types.NewParams(sdk.NewCoin(sdk.DefaultBondDenom, createPoolFee), maxRewardCategoryN, taxRate),
 		nil, nil, 0, nil,

diff --git a/modules/farm/simulation/operations.go b/modules/farm/simulation/operations.go
@@ -56,11 +56,6 @@ func WeightedOperations(
 			weightMsgStake = 50
 		},
 	)
-	appParams.GetOrGenerate(OpWeightMsgStake, &weightMsgStake, nil,
-		func(_ *rand.Rand) {
-			weightMsgStake = 50
-		},
-	)
 	appParams.GetOrGenerate(OpWeightMsgUnStake, &weightMsgUnStake, nil,
 		func(_ *rand.Rand) {
 			weightMsgUnStake = 50

diff --git a/modules/htlc/genesis_test.go b/modules/htlc/genesis_test.go
@@ -10,6 +10,7 @@ package htlc_test
 
 // 	"github.com/cosmos/cosmos-sdk/codec"
 // 	sdk "github.com/cosmos/cosmos-sdk/types"
+// 	"cosmossdk.io/math"
 
 // 	"mods.irisnet.org/simapp"
 // 	"mods.irisnet.org/modules/htlc/keeper"
@@ -76,7 +77,7 @@ package htlc_test
 // 		name: "0 deputy fees",
 // 		genState: func() *types.GenesisState {
 // 			gs := NewHTLTGenesis(suite.addrs[0])
-// 			gs.Params.AssetParams[0].FixedFee = sdk.ZeroInt()
+// 			gs.Params.AssetParams[0].FixedFee = math.ZeroInt()
 // 			return gs
 // 		},
 // 		expectPass: true,

diff --git a/modules/htlc/migrations/v2/migrate_test.go b/modules/htlc/migrations/v2/migrate_test.go
@@ -10,6 +10,7 @@ package v2_test
 // 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 
 // 	sdk "github.com/cosmos/cosmos-sdk/types"
+// 	"cosmossdk.io/math"
 
 // 	"mods.irisnet.org/simapp"
 // 	v2 "mods.irisnet.org/modules/htlc/migrations/v2"
@@ -29,7 +30,7 @@ package v2_test
 // 				SupplyLimit: htlctypes.SupplyLimit{
 // 					Limit:          sdk.NewInt(350000000000000),
 // 					TimeLimited:    false,
-// 					TimeBasedLimit: sdk.ZeroInt(),
+// 					TimeBasedLimit: math.ZeroInt(),
 // 					TimePeriod:     time.Hour,
 // 				},
 // 				Active:        true,