test: proposal test of param change:

sge-network · May 30, 2024 · ab4c060 · ab4c060
1 parent 980ae0e
commit ab4c060
Show file tree

Hide file tree

Showing 22 changed files with 77 additions and 38 deletions.
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -290,6 +290,7 @@ func NewAppKeeper(
 			BankKeeper:    appKeepers.BankKeeper,
 		},
 		authtypes.FeeCollectorName,
+		govModAddress,
 	)
 
 	appKeepers.DistrKeeper = distrkeeper.NewKeeper(
@@ -475,7 +476,6 @@ func NewAppKeeper(
 	appKeepers.ContractKeeper = wasmkeeper.NewDefaultPermissionKeeper(&appKeepers.WasmKeeper)
 	appKeepers.Ics20WasmHooks.ContractKeeper = &appKeepers.WasmKeeper
 
-	authority := authtypes.NewModuleAddress(govtypes.ModuleName).String()
 	// // SGE keepers \\\\
 
 	appKeepers.OrderbookKeeper = orderbookmodulekeeper.NewKeeper(
@@ -487,23 +487,23 @@ func NewAppKeeper(
 			AccountKeeper:  appKeepers.AccountKeeper,
 			FeeGrantKeeper: appKeepers.FeeGrantKeeper,
 		},
-		authority,
+		govModAddress,
 	)
 
 	appKeepers.OVMKeeper = ovmmodulekeeper.NewKeeper(
 		appCodec,
 		appKeepers.keys[ovmmoduletypes.StoreKey],
 		appKeepers.keys[ovmmoduletypes.MemStoreKey],
 		appKeepers.GetSubspace(ovmmoduletypes.ModuleName),
-		authority,
+		govModAddress,
 	)
 
 	appKeepers.MarketKeeper = marketmodulekeeper.NewKeeper(
 		appCodec,
 		appKeepers.keys[marketmoduletypes.StoreKey],
 		appKeepers.keys[marketmoduletypes.MemStoreKey],
 		appKeepers.GetSubspace(marketmoduletypes.ModuleName),
-		authority,
+		govModAddress,
 	)
 	appKeepers.MarketKeeper.SetOVMKeeper(appKeepers.OVMKeeper)
 	appKeepers.MarketKeeper.SetOrderbookKeeper(appKeepers.OrderbookKeeper)
@@ -513,7 +513,7 @@ func NewAppKeeper(
 		appKeepers.keys[betmoduletypes.StoreKey],
 		appKeepers.keys[betmoduletypes.MemStoreKey],
 		appKeepers.GetSubspace(betmoduletypes.ModuleName),
-		authority,
+		govModAddress,
 	)
 	appKeepers.BetKeeper.SetMarketKeeper(appKeepers.MarketKeeper)
 	appKeepers.BetKeeper.SetOrderbookKeeper(appKeepers.OrderbookKeeper)
@@ -532,7 +532,7 @@ func NewAppKeeper(
 		housemodulekeeper.SdkExpectedKeepers{
 			AuthzKeeper: appKeepers.AuthzKeeper,
 		},
-		authority,
+		govModAddress,
 	)
 	appKeepers.OrderbookKeeper.SetHouseKeeper(appKeepers.HouseKeeper)
 
@@ -546,7 +546,7 @@ func NewAppKeeper(
 		appKeepers.BetKeeper,
 		appKeepers.OrderbookKeeper,
 		appKeepers.HouseKeeper,
-		authority,
+		govModAddress,
 	)
 
 	appKeepers.RewardKeeper = rewardmodulekeeper.NewKeeper(
@@ -562,7 +562,7 @@ func NewAppKeeper(
 			BankKeeper:    appKeepers.BankKeeper,
 			AccountKeeper: appKeepers.AccountKeeper,
 		},
-		authority,
+		govModAddress,
 	)
 
 	// ** Hooks ** \\

diff --git a/go.mod b/go.mod
@@ -33,7 +33,6 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de
 	google.golang.org/grpc v1.63.2
 	gopkg.in/yaml.v2 v2.4.0
-	gotest.tools/v3 v3.5.1
 	mvdan.cc/gofumpt v0.5.0
 )
 

diff --git a/go.sum b/go.sum
@@ -2273,6 +2273,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
 gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=

diff --git a/x/bet/simulation/proposals.go b/x/bet/simulation/proposals.go
@@ -16,7 +16,7 @@ import (
 const (
 	DefaultWeightMsgUpdateParams int = 100
 
-	OpWeightMsgUpdateParams = "op_weight_msg_update_params" //nolint:gosec
+	OpWeightMsgUpdateParams = "op_weight_msg_update_params" //#nosec
 )
 
 // ProposalMsgs defines the module weighted proposals' contents

diff --git a/x/bet/simulation/proposals_test.go b/x/bet/simulation/proposals_test.go
@@ -19,6 +19,7 @@ import (
 func TestProposalMsgs(t *testing.T) {
 	// initialize parameters
 	s := rand.NewSource(1)
+	//#nosec
 	r := rand.New(s)
 
 	ctx := sdk.NewContext(nil, tmproto.Header{}, true, nil)

diff --git a/x/house/simulation/proposals.go b/x/house/simulation/proposals.go
@@ -16,7 +16,7 @@ import (
 const (
 	DefaultWeightMsgUpdateParams int = 100
 
-	OpWeightMsgUpdateParams = "op_weight_msg_update_params" //nolint:gosec
+	OpWeightMsgUpdateParams = "op_weight_msg_update_params" //#nosec
 )
 
 // ProposalMsgs defines the module weighted proposals' contents

diff --git a/x/house/simulation/proposals_test.go b/x/house/simulation/proposals_test.go
@@ -19,6 +19,7 @@ import (
 func TestProposalMsgs(t *testing.T) {
 	// initialize parameters
 	s := rand.NewSource(1)
+	//#nosec
 	r := rand.New(s)
 
 	ctx := sdk.NewContext(nil, tmproto.Header{}, true, nil)

diff --git a/x/market/simulation/proposals.go b/x/market/simulation/proposals.go
@@ -15,7 +15,7 @@ import (
 const (
 	DefaultWeightMsgUpdateParams int = 100
 
-	OpWeightMsgUpdateParams = "op_weight_msg_update_params" //nolint:gosec
+	OpWeightMsgUpdateParams = "op_weight_msg_update_params" //#nosec
 )
 
 // ProposalMsgs defines the module weighted proposals' contents
@@ -30,7 +30,7 @@ func ProposalMsgs() []simtypes.WeightedProposalMsg {
 }
 
 // SimulateMsgUpdateParams returns a random MsgUpdateParams
-func SimulateMsgUpdateParams(r *rand.Rand, _ sdk.Context, _ []simtypes.Account) sdk.Msg {
+func SimulateMsgUpdateParams(_ *rand.Rand, _ sdk.Context, _ []simtypes.Account) sdk.Msg {
 	// use the default gov module account address as authority
 	var authority sdk.AccAddress = address.Module("gov")
 

diff --git a/x/market/simulation/proposals_test.go b/x/market/simulation/proposals_test.go
@@ -18,6 +18,7 @@ import (
 func TestProposalMsgs(t *testing.T) {
 	// initialize parameters
 	s := rand.NewSource(1)
+	//#nosec
 	r := rand.New(s)
 
 	ctx := sdk.NewContext(nil, tmproto.Header{}, true, nil)

diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go
@@ -21,6 +21,9 @@ type Keeper struct {
 	stakingKeeper    types.StakingKeeper
 	bankKeeper       types.BankKeeper
 	feeCollectorName string
+	// the address capable of executing a MsgUpdateParams message. Typically, this
+	// should be the x/gov module account.
+	authority string
 }
 
 // ExpectedKeepers contains expected keepers parameter needed by NewKeeper
@@ -37,6 +40,7 @@ func NewKeeper(
 	ak types.AccountKeeper,
 	expectedKeepers ExpectedKeepers,
 	feeCollectorName string,
+	authority string,
 ) *Keeper {
 	// ensure mint module account is set
 	if addr := ak.GetModuleAddress(types.ModuleName); addr == nil {
@@ -55,6 +59,7 @@ func NewKeeper(
 		stakingKeeper:    expectedKeepers.StakingKeeper,
 		bankKeeper:       expectedKeepers.BankKeeper,
 		feeCollectorName: feeCollectorName,
+		authority:        authority,
 	}
 }
 

diff --git a/x/mint/keeper/msg_server.go b/x/mint/keeper/msg_server.go
@@ -0,0 +1,17 @@
+package keeper
+
+import (
+	"github.com/sge-network/sge/x/mint/types"
+)
+
+type msgServer struct {
+	Keeper
+}
+
+// NewMsgServerImpl returns an implementation of the MsgServer interface
+// for the provided Keeper.
+func NewMsgServerImpl(keeper Keeper) types.MsgServer {
+	return &msgServer{Keeper: keeper}
+}
+
+var _ types.MsgServer = msgServer{}
diff --git a/x/mint/keeper/msg_server_params.go b/x/mint/keeper/msg_server_params.go
@@ -0,0 +1,28 @@
+package keeper
+
+import (
+	"context"
+
+	"cosmossdk.io/errors"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+
+	"github.com/sge-network/sge/x/mint/types"
+)
+
+// UpdateParams updates the params.
+func (k msgServer) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) {
+	ctx := sdk.UnwrapSDKContext(goCtx)
+
+	if k.authority != req.Authority {
+		return nil, errors.Wrapf(govtypes.ErrInvalidSigner, "invalid authority; expected %s, got %s", k.authority, req.Authority)
+	}
+
+	if err := req.Params.Validate(); err != nil {
+		return nil, err
+	}
+
+	k.SetParams(ctx, req.Params)
+
+	return &types.MsgUpdateParamsResponse{}, nil
+}
diff --git a/x/mint/module.go b/x/mint/module.go
@@ -127,6 +127,7 @@ func (AppModule) QuerierRoute() string { return types.QuerierRoute }
 // RegisterServices registers a GRPC query service to respond to the
 // module-specific GRPC queries.
 func (am AppModule) RegisterServices(cfg module.Configurator) {
+	types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
 	types.RegisterQueryServer(cfg.QueryServer(), am.keeper)
 }
 

diff --git a/x/orderbook/keeper/msg_server_test.go b/x/orderbook/keeper/msg_server_test.go
diff --git a/x/orderbook/simulation/proposals.go b/x/orderbook/simulation/proposals.go
@@ -15,7 +15,7 @@ import (
 const (
 	DefaultWeightMsgUpdateParams int = 100
 
-	OpWeightMsgUpdateParams = "op_weight_msg_update_params" //nolint:gosec
+	OpWeightMsgUpdateParams = "op_weight_msg_update_params" //#nosec
 )
 
 // ProposalMsgs defines the module weighted proposals' contents

diff --git a/x/orderbook/simulation/proposals_test.go b/x/orderbook/simulation/proposals_test.go
@@ -18,6 +18,7 @@ import (
 func TestProposalMsgs(t *testing.T) {
 	// initialize parameters
 	s := rand.NewSource(1)
+	//#nosec
 	r := rand.New(s)
 
 	ctx := sdk.NewContext(nil, tmproto.Header{}, true, nil)

diff --git a/x/ovm/simulation/proposals.go b/x/ovm/simulation/proposals.go
@@ -15,7 +15,7 @@ import (
 const (
 	DefaultWeightMsgUpdateParams int = 100
 
-	OpWeightMsgUpdateParams = "op_weight_msg_update_params" //nolint:gosec
+	OpWeightMsgUpdateParams = "op_weight_msg_update_params" //#nosec
 )
 
 // ProposalMsgs defines the module weighted proposals' contents
@@ -30,7 +30,7 @@ func ProposalMsgs() []simtypes.WeightedProposalMsg {
 }
 
 // SimulateMsgUpdateParams returns a random MsgUpdateParams
-func SimulateMsgUpdateParams(r *rand.Rand, _ sdk.Context, _ []simtypes.Account) sdk.Msg {
+func SimulateMsgUpdateParams(_ *rand.Rand, _ sdk.Context, _ []simtypes.Account) sdk.Msg {
 	// use the default gov module account address as authority
 	var authority sdk.AccAddress = address.Module("gov")
 

diff --git a/x/ovm/simulation/proposals_test.go b/x/ovm/simulation/proposals_test.go
@@ -18,6 +18,7 @@ import (
 func TestProposalMsgs(t *testing.T) {
 	// initialize parameters
 	s := rand.NewSource(1)
+	//#nosec
 	r := rand.New(s)
 
 	ctx := sdk.NewContext(nil, tmproto.Header{}, true, nil)

diff --git a/x/reward/simulation/proposals.go b/x/reward/simulation/proposals.go
@@ -15,7 +15,7 @@ import (
 const (
 	DefaultWeightMsgUpdateParams int = 100
 
-	OpWeightMsgUpdateParams = "op_weight_msg_update_params" //nolint:gosec
+	OpWeightMsgUpdateParams = "op_weight_msg_update_params" //#nosec
 )
 
 // ProposalMsgs defines the module weighted proposals' contents
@@ -30,7 +30,7 @@ func ProposalMsgs() []simtypes.WeightedProposalMsg {
 }
 
 // SimulateMsgUpdateParams returns a random MsgUpdateParams
-func SimulateMsgUpdateParams(r *rand.Rand, _ sdk.Context, _ []simtypes.Account) sdk.Msg {
+func SimulateMsgUpdateParams(_ *rand.Rand, _ sdk.Context, _ []simtypes.Account) sdk.Msg {
 	// use the default gov module account address as authority
 	var authority sdk.AccAddress = address.Module("gov")
 

diff --git a/x/reward/simulation/proposals_test.go b/x/reward/simulation/proposals_test.go
@@ -18,6 +18,7 @@ import (
 func TestProposalMsgs(t *testing.T) {
 	// initialize parameters
 	s := rand.NewSource(1)
+	//#nosec
 	r := rand.New(s)
 
 	ctx := sdk.NewContext(nil, tmproto.Header{}, true, nil)

diff --git a/x/subaccount/simulation/proposals.go b/x/subaccount/simulation/proposals.go
@@ -15,7 +15,7 @@ import (
 const (
 	DefaultWeightMsgUpdateParams int = 100
 
-	OpWeightMsgUpdateParams = "op_weight_msg_update_params" //nolint:gosec
+	OpWeightMsgUpdateParams = "op_weight_msg_update_params" //#nosec
 )
 
 // ProposalMsgs defines the module weighted proposals' contents

diff --git a/x/subaccount/simulation/proposals_test.go b/x/subaccount/simulation/proposals_test.go
@@ -18,6 +18,7 @@ import (
 func TestProposalMsgs(t *testing.T) {
 	// initialize parameters
 	s := rand.NewSource(1)
+	//#nosec
 	r := rand.New(s)
 
 	ctx := sdk.NewContext(nil, tmproto.Header{}, true, nil)