From 678fe9d1bfcb89f2371ee026ce1cca3e530fc081 Mon Sep 17 00:00:00 2001 From: Gurjot Date: Fri, 13 Sep 2024 14:37:38 -0400 Subject: [PATCH] rename method --- x/btcstaking/keeper/finality_providers.go | 2 +- x/finality/keeper/msg_server.go | 2 +- x/finality/keeper/msg_server_test.go | 4 ++-- x/finality/types/expected_keepers.go | 2 +- x/finality/types/mocked_keepers.go | 12 ++++++------ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/x/btcstaking/keeper/finality_providers.go b/x/btcstaking/keeper/finality_providers.go index 865c6b921..b543e564a 100644 --- a/x/btcstaking/keeper/finality_providers.go +++ b/x/btcstaking/keeper/finality_providers.go @@ -68,7 +68,7 @@ func (k Keeper) SlashFinalityProvider(ctx context.Context, fpBTCPK []byte) error return nil } -func (k Keeper) NotifyConsumersOfSlashedFinalityProvider(ctx context.Context, fpBTCPK *bbn.BIP340PubKey) error { +func (k Keeper) PropagateFPSlashingToConsumers(ctx context.Context, fpBTCPK *bbn.BIP340PubKey) error { // Get all delegations for this finality provider delegations, err := k.getFPBTCDelegations(ctx, fpBTCPK) if err != nil { diff --git a/x/finality/keeper/msg_server.go b/x/finality/keeper/msg_server.go index 642e25f0f..3eb527977 100644 --- a/x/finality/keeper/msg_server.go +++ b/x/finality/keeper/msg_server.go @@ -240,7 +240,7 @@ func (k Keeper) slashFinalityProvider(ctx context.Context, fpBtcPk *bbn.BIP340Pu } // Notify consumer chains about the slashed finality provider - if err := k.BTCStakingKeeper.NotifyConsumersOfSlashedFinalityProvider(ctx, fpBtcPk); err != nil { + if err := k.BTCStakingKeeper.PropagateFPSlashingToConsumers(ctx, fpBtcPk); err != nil { panic(fmt.Errorf("failed to notify consumers of slashed finality provider: %w", err)) } diff --git a/x/finality/keeper/msg_server_test.go b/x/finality/keeper/msg_server_test.go index 668554ea5..59c90270f 100644 --- a/x/finality/keeper/msg_server_test.go +++ b/x/finality/keeper/msg_server_test.go @@ -173,7 +173,7 @@ func FuzzAddFinalitySig(f *testing.F) { bsKeeper.EXPECT().GetFinalityProvider(gomock.Any(), gomock.Eq(fpBTCPKBytes)).Return(fp, nil).Times(1) // mock slashing interface bsKeeper.EXPECT().SlashFinalityProvider(gomock.Any(), gomock.Eq(fpBTCPKBytes)).Return(nil).Times(1) - bsKeeper.EXPECT().NotifyConsumersOfSlashedFinalityProvider(gomock.Any(), gomock.Eq(fpBTCPK)).Return(nil).Times(1) + bsKeeper.EXPECT().PropagateFPSlashingToConsumers(gomock.Any(), gomock.Eq(fpBTCPK)).Return(nil).Times(1) // NOTE: even though this finality provider is slashed, the msg should be successful // Otherwise the saved evidence will be rolled back @@ -267,7 +267,7 @@ func TestVoteForConflictingHashShouldRetrieveEvidenceAndSlash(t *testing.T) { gomock.Eq(fpBTCPKBytes)).Return(fp, nil).Times(1) bsKeeper.EXPECT().SlashFinalityProvider(gomock.Any(), gomock.Eq(fpBTCPKBytes)).Return(nil).Times(1) - bsKeeper.EXPECT().NotifyConsumersOfSlashedFinalityProvider(gomock.Any(), + bsKeeper.EXPECT().PropagateFPSlashingToConsumers(gomock.Any(), gomock.Eq(fpBTCPK)).Return(nil).Times(1) _, err = ms.AddFinalitySig(ctx, msg) require.NoError(t, err) diff --git a/x/finality/types/expected_keepers.go b/x/finality/types/expected_keepers.go index 8d10ca881..52f9951c7 100644 --- a/x/finality/types/expected_keepers.go +++ b/x/finality/types/expected_keepers.go @@ -12,7 +12,7 @@ type BTCStakingKeeper interface { GetFinalityProvider(ctx context.Context, fpBTCPK []byte) (*bstypes.FinalityProvider, error) HasFinalityProvider(ctx context.Context, fpBTCPK []byte) bool SlashFinalityProvider(ctx context.Context, fpBTCPK []byte) error - NotifyConsumersOfSlashedFinalityProvider(ctx context.Context, fpBTCPK *bbn.BIP340PubKey) error + PropagateFPSlashingToConsumers(ctx context.Context, fpBTCPK *bbn.BIP340PubKey) error GetVotingPower(ctx context.Context, fpBTCPK []byte, height uint64) uint64 GetVotingPowerTable(ctx context.Context, height uint64) map[string]uint64 GetBTCStakingActivatedHeight(ctx context.Context) (uint64, error) diff --git a/x/finality/types/mocked_keepers.go b/x/finality/types/mocked_keepers.go index 098c39451..d1254492f 100644 --- a/x/finality/types/mocked_keepers.go +++ b/x/finality/types/mocked_keepers.go @@ -151,18 +151,18 @@ func (mr *MockBTCStakingKeeperMockRecorder) HasFinalityProvider(ctx, fpBTCPK int return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasFinalityProvider", reflect.TypeOf((*MockBTCStakingKeeper)(nil).HasFinalityProvider), ctx, fpBTCPK) } -// NotifyConsumersOfSlashedFinalityProvider mocks base method. -func (m *MockBTCStakingKeeper) NotifyConsumersOfSlashedFinalityProvider(ctx context.Context, fpBTCPK *types.BIP340PubKey) error { +// PropagateFPSlashingToConsumers mocks base method. +func (m *MockBTCStakingKeeper) PropagateFPSlashingToConsumers(ctx context.Context, fpBTCPK *types.BIP340PubKey) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "NotifyConsumersOfSlashedFinalityProvider", ctx, fpBTCPK) + ret := m.ctrl.Call(m, "PropagateFPSlashingToConsumers", ctx, fpBTCPK) ret0, _ := ret[0].(error) return ret0 } -// NotifyConsumersOfSlashedFinalityProvider indicates an expected call of NotifyConsumersOfSlashedFinalityProvider. -func (mr *MockBTCStakingKeeperMockRecorder) NotifyConsumersOfSlashedFinalityProvider(ctx, fpBTCPK interface{}) *gomock.Call { +// PropagateFPSlashingToConsumers indicates an expected call of PropagateFPSlashingToConsumers. +func (mr *MockBTCStakingKeeperMockRecorder) PropagateFPSlashingToConsumers(ctx, fpBTCPK interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NotifyConsumersOfSlashedFinalityProvider", reflect.TypeOf((*MockBTCStakingKeeper)(nil).NotifyConsumersOfSlashedFinalityProvider), ctx, fpBTCPK) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PropagateFPSlashingToConsumers", reflect.TypeOf((*MockBTCStakingKeeper)(nil).PropagateFPSlashingToConsumers), ctx, fpBTCPK) } // RemoveVotingPowerDistCache mocks base method.