Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX: [core] remove session order store #1788

Merged
merged 1 commit into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions pkg/bbgo/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"github.com/spf13/viper"

"github.com/c9s/bbgo/pkg/cache"
"github.com/c9s/bbgo/pkg/core"
"github.com/c9s/bbgo/pkg/exchange/retry"
"github.com/c9s/bbgo/pkg/util/templateutil"

Expand Down Expand Up @@ -120,8 +119,6 @@ type ExchangeSession struct {
// indicators is the v2 api indicators
indicators map[string]*IndicatorSet

orderStores map[string]*core.OrderStore

usedSymbols map[string]struct{}
initializedSymbols map[string]struct{}

Expand Down Expand Up @@ -150,7 +147,6 @@ func NewExchangeSession(name string, exchange types.Exchange) *ExchangeSession {
marketDataStores: make(map[string]*MarketDataStore),
standardIndicatorSets: make(map[string]*StandardIndicatorSet),
indicators: make(map[string]*IndicatorSet),
orderStores: make(map[string]*core.OrderStore),
usedSymbols: make(map[string]struct{}),
initializedSymbols: make(map[string]struct{}),
logger: log.WithField("session", name),
Expand Down Expand Up @@ -439,11 +435,6 @@ func (session *ExchangeSession) initSymbol(ctx context.Context, environ *Environ
position.BindStream(session.UserDataStream)
session.positions[symbol] = position

orderStore := core.NewOrderStore(symbol)
orderStore.AddOrderUpdate = true
orderStore.BindStream(session.UserDataStream)
session.orderStores[symbol] = orderStore

marketDataStore := NewMarketDataStore(symbol)
if !disableMarketDataStore {
if _, ok := session.marketDataStores[symbol]; !ok {
Expand Down Expand Up @@ -665,15 +656,6 @@ func (session *ExchangeSession) SetMarkets(markets types.MarketMap) {
session.markets = markets
}

func (session *ExchangeSession) OrderStore(symbol string) (store *core.OrderStore, ok bool) {
store, ok = session.orderStores[symbol]
return store, ok
}

func (session *ExchangeSession) OrderStores() map[string]*core.OrderStore {
return session.orderStores
}

// Subscribe save the subscription info, later it will be assigned to the stream
func (session *ExchangeSession) Subscribe(
channel types.Channel, symbol string, options types.SubscribeOptions,
Expand Down Expand Up @@ -876,7 +858,6 @@ func (session *ExchangeSession) InitExchange(name string, ex types.Exchange) err
session.positions = make(map[string]*types.Position)
session.standardIndicatorSets = make(map[string]*StandardIndicatorSet)
session.indicators = make(map[string]*IndicatorSet)
session.orderStores = make(map[string]*core.OrderStore)
session.OrderExecutor = &ExchangeOrderExecutor{
// copy the notification system so that we can route
Session: session,
Expand Down
16 changes: 2 additions & 14 deletions pkg/server/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -405,20 +405,8 @@ func (s *Server) getSessionAccountBalance(c *gin.Context) {
}

func (s *Server) listSessionOpenOrders(c *gin.Context) {
sessionName := c.Param("session")
session, ok := s.Environ.Session(sessionName)

if !ok {
c.JSON(http.StatusNotFound, gin.H{"error": fmt.Sprintf("session %s not found", sessionName)})
return
}

marketOrders := make(map[string][]types.Order)
for symbol, orderStore := range session.OrderStores() {
marketOrders[symbol] = orderStore.Orders()
}

c.JSON(http.StatusOK, gin.H{"orders": marketOrders})
// FIXME
c.JSON(http.StatusOK, gin.H{"orders": nil})
}

func genFakeAssets() types.AssetMap {
Expand Down
Loading