fix: use seconds unit for auction extension for governance and return…

… if we've extended it
vegaprotocol · Feb 19, 2024 · 4a36fe2 · 4a36fe2
1 parent 8c35ac5
commit 4a36fe2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/core/execution/future/auction.go b/core/execution/future/auction.go
@@ -33,7 +33,8 @@ func (m *Market) checkAuction(ctx context.Context, now time.Time, idgen common.I
 
 	if m.mkt.State == types.MarketStateSuspendedViaGovernance {
 		if endTS := m.as.ExpiresAt(); endTS != nil && endTS.Before(now) {
-			m.as.ExtendAuctionSuspension(types.AuctionDuration{Duration: int64(m.minDuration)})
+			m.as.ExtendAuctionSuspension(types.AuctionDuration{Duration: int64(m.minDuration.Seconds())})
+			return
 		}
 	}
 

diff --git a/core/execution/future/market.go b/core/execution/future/market.go
@@ -1382,7 +1382,7 @@ func (m *Market) UpdateMarketState(ctx context.Context, changes *types.MarketSta
 		m.mkt.State = types.MarketStateSuspendedViaGovernance
 		m.mkt.TradingMode = types.MarketTradingModeSuspendedViaGovernance
 		if m.as.InAuction() {
-			m.as.ExtendAuctionSuspension(types.AuctionDuration{Duration: int64(m.minDuration)})
+			m.as.ExtendAuctionSuspension(types.AuctionDuration{Duration: int64(m.minDuration.Seconds())})
 			evt := m.as.AuctionExtended(ctx, m.timeService.GetTimeNow())
 			if evt != nil {
 				m.broker.Send(evt)

diff --git a/core/execution/spot/auction.go b/core/execution/spot/auction.go
@@ -34,7 +34,7 @@ func (m *Market) checkAuction(ctx context.Context, now time.Time, idgen common.I
 
 	if m.mkt.State == types.MarketStateSuspendedViaGovernance {
 		if endTS := m.as.ExpiresAt(); endTS != nil && endTS.Before(now) {
-			m.as.ExtendAuctionSuspension(types.AuctionDuration{Duration: int64(m.minDuration)})
+			m.as.ExtendAuctionSuspension(types.AuctionDuration{Duration: int64(m.minDuration.Seconds())})
 		}
 	}
 

diff --git a/core/execution/spot/market.go b/core/execution/spot/market.go
@@ -480,7 +480,7 @@ func (m *Market) UpdateMarketState(ctx context.Context, changes *types.MarketSta
 		m.mkt.State = types.MarketStateSuspendedViaGovernance
 		m.mkt.TradingMode = types.MarketTradingModeSuspendedViaGovernance
 		if m.as.InAuction() {
-			m.as.ExtendAuctionSuspension(types.AuctionDuration{Duration: int64(m.minDuration)})
+			m.as.ExtendAuctionSuspension(types.AuctionDuration{Duration: int64(m.minDuration.Seconds())})
 			evt := m.as.AuctionExtended(ctx, m.timeService.GetTimeNow())
 			if evt != nil {
 				m.broker.Send(evt)