fix: lint, test and build

terra-money · Aug 16, 2023 · 76f624d · 76f624d
1 parent 307b519
commit 76f624d
Show file tree

Hide file tree

Showing 7 changed files with 253 additions and 241 deletions.
diff --git a/x/auth/vesting/handler_test.go b/x/auth/vesting/handler_test.go
diff --git a/x/auth/vesting/module.go b/x/auth/vesting/module.go
@@ -152,7 +152,7 @@ type VestingInputs struct {
 
 	AccountKeeper keeper.AccountKeeper
 	BankKeeper    types.BankKeeper
-	DistrKeeper   types.DistrKeeper
+	// DistrKeeper   types.DistrKeeper
 	StakingKeeper types.StakingKeeper
 }
 
@@ -163,7 +163,7 @@ type VestingOutputs struct {
 }
 
 func ProvideModule(in VestingInputs) VestingOutputs {
-	m := NewAppModule(in.AccountKeeper, in.BankKeeper, in.DistrKeeper, in.StakingKeeper)
+	m := NewAppModule(in.AccountKeeper, in.BankKeeper, nil, in.StakingKeeper)
 
 	return VestingOutputs{Module: m}
 }
diff --git a/x/auth/vesting/msg_server.go b/x/auth/vesting/msg_server.go
@@ -276,13 +276,5 @@ func (s msgServer) DonateAllVestingTokens(goCtx context.Context, msg *types.MsgD
 		return nil, err
 	}
 
-	ctx.EventManager().EmitEvent(
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-			sdk.NewAttribute(sdk.AttributeKeyAmount, vestingCoins.String()),
-		),
-	)
-
 	return &types.MsgDonateAllVestingTokensResponse{}, nil
 }
diff --git a/x/auth/vesting/msg_server_test.go b/x/auth/vesting/msg_server_test.go
@@ -34,6 +34,8 @@ type VestingTestSuite struct {
 	ctx           sdk.Context
 	accountKeeper authkeeper.AccountKeeper
 	bankKeeper    *vestingtestutil.MockBankKeeper
+	distrKeeper   *vestingtestutil.MockDistrKeeper
+	stakingKeeper *vestingtestutil.MockStakingKeeper
 	msgServer     vestingtypes.MsgServer
 }
 
@@ -47,6 +49,8 @@ func (s *VestingTestSuite) SetupTest() {
 
 	ctrl := gomock.NewController(s.T())
 	s.bankKeeper = vestingtestutil.NewMockBankKeeper(ctrl)
+	s.distrKeeper = vestingtestutil.NewMockDistrKeeper(ctrl)
+	s.stakingKeeper = vestingtestutil.NewMockStakingKeeper(ctrl)
 	s.accountKeeper = authkeeper.NewAccountKeeper(
 		encCfg.Codec,
 		key,
@@ -58,7 +62,7 @@ func (s *VestingTestSuite) SetupTest() {
 
 	vestingtypes.RegisterInterfaces(encCfg.InterfaceRegistry)
 	authtypes.RegisterInterfaces(encCfg.InterfaceRegistry)
-	s.msgServer = vesting.NewMsgServerImpl(s.accountKeeper, s.bankKeeper)
+	s.msgServer = vesting.NewMsgServerImpl(s.accountKeeper, s.bankKeeper, s.distrKeeper, s.stakingKeeper)
 }
 
 func (s *VestingTestSuite) TestCreateVestingAccount() {