Skip to content

Commit dea2d94

Browse files
authored
Merge pull request #11587 from vegaprotocol/11583-market-data-on-settle
fix: when closing a market remove AMMs entirely from engine
2 parents 2bfad77 + 9048e7d commit dea2d94

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
- [11526](https://github.com/vegaprotocol/vega/issues/11526) - `EstimateAMMBounds` now respects the market's decimal places.
3232
- [11486](https://github.com/vegaprotocol/vega/issues/11486) - `AMMs` can now be submitted on markets with more decimal places than asset decimal places.
3333
- [11561](https://github.com/vegaprotocol/vega/issues/11561) - Failing amends on `AMMs` now restore original properly.
34+
- [11583](https://github.com/vegaprotocol/vega/issues/11583) - Remove `AMMs` entirely from engine when market closes.
3435
- [11568](https://github.com/vegaprotocol/vega/issues/11568) - order book shape on closing `AMM` no longer panics.
3536
- [11540](https://github.com/vegaprotocol/vega/issues/11540) - Fix spam check for spots to use not double count quantum.
3637
- [11542](https://github.com/vegaprotocol/vega/issues/11542) - Fix non determinism in lottery ranking.

core/execution/amm/engine.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -820,6 +820,10 @@ func (e *Engine) MarketClosing(ctx context.Context) error {
820820
e.sendUpdate(ctx, p)
821821
e.marketActivityTracker.RemoveAMMParty(e.assetID, e.marketID, p.AMMParty)
822822
}
823+
824+
e.pools = nil
825+
e.poolsCpy = nil
826+
e.ammParties = nil
823827
return nil
824828
}
825829

core/execution/amm/engine_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -656,9 +656,9 @@ func testMarketClosure(t *testing.T) {
656656
}
657657

658658
require.NoError(t, tst.engine.MarketClosing(ctx))
659-
for _, p := range tst.engine.poolsCpy {
660-
assert.Equal(t, types.AMMPoolStatusStopped, p.status)
661-
}
659+
require.Equal(t, 0, len(tst.engine.pools))
660+
require.Equal(t, 0, len(tst.engine.poolsCpy))
661+
require.Equal(t, 0, len(tst.engine.ammParties))
662662
}
663663

664664
func expectSubaccountCreation(t *testing.T, tst *tstEngine, party, subAccount string) {

0 commit comments

Comments
 (0)