fix: clean up market map hooks (#778)

skip-mev · Dec 11, 2024 · 2341cdd · 2341cdd
1 parent 9eb4eeb
commit 2341cdd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/x/marketmap/keeper/msg_server.go b/x/marketmap/keeper/msg_server.go
@@ -283,6 +283,10 @@ func (ms msgServer) RemoveMarkets(
 			ctx.Logger().Info(fmt.Sprintf("deleted market %s", market))
 			deletedMarkets = append(deletedMarkets, market)
 		}
+
+		if err := ms.k.hooks.AfterMarketRemoved(ctx, market); err != nil {
+			return nil, fmt.Errorf("unable to run market removal hook: %w", err)
+		}
 	}
 
 	// check if the resulting state is valid: it may not be valid if the removed market is used as a normalization pair

diff --git a/x/marketmap/types/hooks.go b/x/marketmap/types/hooks.go
@@ -16,7 +16,7 @@ type MarketMapHooks interface {
 	AfterMarketGenesis(ctx sdk.Context, tickers map[string]Market) error
 
 	// AfterMarketRemoved is called after a market is removed.
-	AfterMarketRemoved(ctx sdk.Context, market Market) error
+	AfterMarketRemoved(ctx sdk.Context, key string) error
 }
 
 var _ MarketMapHooks = &MultiMarketMapHooks{}
@@ -58,9 +58,9 @@ func (mh MultiMarketMapHooks) AfterMarketGenesis(ctx sdk.Context, markets map[st
 }
 
 // AfterMarketRemoved calls all AfterMarketRemoved hooks registered to the MultiMarketMapHooks.
-func (mh MultiMarketMapHooks) AfterMarketRemoved(ctx sdk.Context, market Market) error {
+func (mh MultiMarketMapHooks) AfterMarketRemoved(ctx sdk.Context, key string) error {
 	for i := range mh {
-		if err := mh[i].AfterMarketRemoved(ctx, market); err != nil {
+		if err := mh[i].AfterMarketRemoved(ctx, key); err != nil {
 			return err
 		}
 	}
@@ -88,6 +88,6 @@ func (n *NoopMarketMapHooks) AfterMarketGenesis(_ sdk.Context, _ map[string]Mark
 	return nil
 }
 
-func (n *NoopMarketMapHooks) AfterMarketRemoved(_ sdk.Context, _ Market) error {
+func (n *NoopMarketMapHooks) AfterMarketRemoved(_ sdk.Context, _ string) error {
 	return nil
 }
diff --git a/x/marketmap/types/mocks/MarketMapHooks.go b/x/marketmap/types/mocks/MarketMapHooks.go
diff --git a/x/oracle/keeper/hooks.go b/x/oracle/keeper/hooks.go
@@ -49,7 +49,8 @@ func (h Hooks) AfterMarketGenesis(ctx sdk.Context, markets map[string]marketmapt
 
 // AfterMarketRemoved is the marketmap hook for x/oracle that is run after a market is removed in
 // the marketmap.
-func (h Hooks) AfterMarketRemoved(ctx sdk.Context, market marketmaptypes.Market) error {
-	ctx.Logger().Info(fmt.Sprintf("market %s removed. retaining x/oracle state if it exists", market.Ticker.String()))
+func (h Hooks) AfterMarketRemoved(ctx sdk.Context, key string) error {
+	ctx.Logger().Info(fmt.Sprintf("market %s removed. retaining x/oracle state if it exists", key))
+
 	return nil
 }