From a6f0b642d8ebf57801abde39ab965db1c38a5d5a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 13:01:26 +0200
Subject: [PATCH] refactor: simplify epoch hooks (backport #21552) (#21557)

Co-authored-by: Julien Robert <julien@rbrt.fr>
---
 x/epochs/types/hooks.go      | 7 -------
 x/epochs/types/hooks_test.go | 5 -----
 x/mint/epoch_hooks.go        | 5 -----
 x/mint/go.mod                | 1 +
 x/mint/go.sum                | 2 --
 5 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/x/epochs/types/hooks.go b/x/epochs/types/hooks.go
index 28ec99409d..f8609a3905 100644
--- a/x/epochs/types/hooks.go
+++ b/x/epochs/types/hooks.go
@@ -10,8 +10,6 @@ type EpochHooks interface {
 	AfterEpochEnd(ctx context.Context, epochIdentifier string, epochNumber int64) error
 	// new epoch is next block of epoch end block
 	BeforeEpochStart(ctx context.Context, epochIdentifier string, epochNumber int64) error
-	// Returns the name of the module implementing epoch hook.
-	GetModuleName() string
 }
 
 var _ EpochHooks = MultiEpochHooks{}
@@ -19,11 +17,6 @@ var _ EpochHooks = MultiEpochHooks{}
 // combine multiple gamm hooks, all hook functions are run in array sequence.
 type MultiEpochHooks []EpochHooks
 
-// GetModuleName implements EpochHooks.
-func (MultiEpochHooks) GetModuleName() string {
-	return ModuleName
-}
-
 func NewMultiEpochHooks(hooks ...EpochHooks) MultiEpochHooks {
 	return hooks
 }
diff --git a/x/epochs/types/hooks_test.go b/x/epochs/types/hooks_test.go
index 8134c55562..01f443163d 100644
--- a/x/epochs/types/hooks_test.go
+++ b/x/epochs/types/hooks_test.go
@@ -37,11 +37,6 @@ type dummyEpochHook struct {
 	shouldError    bool
 }
 
-// GetModuleName implements types.EpochHooks.
-func (*dummyEpochHook) GetModuleName() string {
-	return "dummy"
-}
-
 func (hook *dummyEpochHook) AfterEpochEnd(ctx context.Context, epochIdentifier string, epochNumber int64) error {
 	if hook.shouldError {
 		return dummyErr
diff --git a/x/mint/epoch_hooks.go b/x/mint/epoch_hooks.go
index 9c1ae6ff1c..f2a3daf0d8 100644
--- a/x/mint/epoch_hooks.go
+++ b/x/mint/epoch_hooks.go
@@ -8,11 +8,6 @@ import (
 
 var _ epochstypes.EpochHooks = AppModule{}
 
-// GetModuleName implements types.EpochHooks.
-func (am AppModule) GetModuleName() string {
-	return am.Name()
-}
-
 // BeforeEpochStart calls the mint function.
 func (am AppModule) BeforeEpochStart(ctx context.Context, epochIdentifier string, epochNumber int64) error {
 	minter, err := am.keeper.Minter.Get(ctx)
diff --git a/x/mint/go.mod b/x/mint/go.mod
index 1706e3b049..aa977037ce 100644
--- a/x/mint/go.mod
+++ b/x/mint/go.mod
@@ -185,5 +185,6 @@ replace (
 	cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
 	cosmossdk.io/x/bank => ../bank
 	cosmossdk.io/x/consensus => ../consensus
+	cosmossdk.io/x/epochs => ../epochs
 	cosmossdk.io/x/staking => ../staking
 )
diff --git a/x/mint/go.sum b/x/mint/go.sum
index d48e16d6eb..5e89ff87da 100644
--- a/x/mint/go.sum
+++ b/x/mint/go.sum
@@ -24,8 +24,6 @@ cosmossdk.io/schema v0.2.0 h1:UH5CR1DqUq8yP+5Np8PbvG4YX0zAUsTN2Qk6yThmfMk=
 cosmossdk.io/schema v0.2.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
 cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 h1:o024zaPHYtmUGL2BCX1ns9rfZmMc19U4hQ2CAPt2Xgg=
 cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897/go.mod h1:Ma4uny4RFegWTbU71fBmkSIoHrWHlLC/JwwgWgehZm4=
-cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337 h1:GuBrfHsK3RD5vlD4DuBz3DXslR6VlnzrYmHOC3L679Q=
-cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337/go.mod h1:PhLn1pMBilyRC4GfRkoYhm+XVAYhF4adVrzut8AdpJI=
 cosmossdk.io/x/tx v0.13.4-0.20240815194237-858ec2fcb897 h1:J3vS3G41JtTWkUX3wVKcXdy1yPUca0d3QnexCR52PeY=
 cosmossdk.io/x/tx v0.13.4-0.20240815194237-858ec2fcb897/go.mod h1:5+Hpds6bhT6CdR7DqPh0dVOqyqL7NJkq+x+yjLdYSQU=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=