lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-14 02:53:50 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

bbgo: remove order store from session struct since it's not used

Browse Source
This commit is contained in:
c9s 2024-10-22 12:05:23 +08:00
parent 5878fd8aed
commit 4e13f0dadc
No known key found for this signature in database
GPG Key ID: 7385E7E464CB0A54
2 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/bbgo/session.go
View File

@ -14,7 +14,6 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/c9s/bbgo/pkg/cache" "github.com/c9s/bbgo/pkg/cache"
"github.com/c9s/bbgo/pkg/core"
"github.com/c9s/bbgo/pkg/exchange/retry" "github.com/c9s/bbgo/pkg/exchange/retry"
"github.com/c9s/bbgo/pkg/util/templateutil" "github.com/c9s/bbgo/pkg/util/templateutil"
@ -120,8 +119,6 @@ type ExchangeSession struct {
// indicators is the v2 api indicators // indicators is the v2 api indicators
indicators map[string]*IndicatorSet indicators map[string]*IndicatorSet
orderStores map[string]*core.OrderStore
usedSymbols map[string]struct{} usedSymbols map[string]struct{}
initializedSymbols map[string]struct{} initializedSymbols map[string]struct{}
@ -150,7 +147,6 @@ func NewExchangeSession(name string, exchange types.Exchange) *ExchangeSession {
marketDataStores: make(map[string]*MarketDataStore), marketDataStores: make(map[string]*MarketDataStore),
standardIndicatorSets: make(map[string]*StandardIndicatorSet), standardIndicatorSets: make(map[string]*StandardIndicatorSet),
indicators: make(map[string]*IndicatorSet), indicators: make(map[string]*IndicatorSet),
orderStores: make(map[string]*core.OrderStore),
usedSymbols: make(map[string]struct{}), usedSymbols: make(map[string]struct{}),
initializedSymbols: make(map[string]struct{}), initializedSymbols: make(map[string]struct{}),
logger: log.WithField("session", name), logger: log.WithField("session", name),
@ -439,11 +435,6 @@ func (session *ExchangeSession) initSymbol(ctx context.Context, environ *Environ
position.BindStream(session.UserDataStream) position.BindStream(session.UserDataStream)
session.positions[symbol] = position session.positions[symbol] = position
orderStore := core.NewOrderStore(symbol)
orderStore.AddOrderUpdate = true
orderStore.BindStream(session.UserDataStream)
session.orderStores[symbol] = orderStore
marketDataStore := NewMarketDataStore(symbol) marketDataStore := NewMarketDataStore(symbol)
if !disableMarketDataStore { if !disableMarketDataStore {
if _, ok := session.marketDataStores[symbol]; !ok { if _, ok := session.marketDataStores[symbol]; !ok {
@ -665,15 +656,6 @@ func (session *ExchangeSession) SetMarkets(markets types.MarketMap) {
session.markets = markets 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 // Subscribe save the subscription info, later it will be assigned to the stream
func (session *ExchangeSession) Subscribe( func (session *ExchangeSession) Subscribe(
channel types.Channel, symbol string, options types.SubscribeOptions, channel types.Channel, symbol string, options types.SubscribeOptions,
@ -876,7 +858,6 @@ func (session *ExchangeSession) InitExchange(name string, ex types.Exchange) err
session.positions = make(map[string]*types.Position) session.positions = make(map[string]*types.Position)
session.standardIndicatorSets = make(map[string]*StandardIndicatorSet) session.standardIndicatorSets = make(map[string]*StandardIndicatorSet)
session.indicators = make(map[string]*IndicatorSet) session.indicators = make(map[string]*IndicatorSet)
session.orderStores = make(map[string]*core.OrderStore)
session.OrderExecutor = &ExchangeOrderExecutor{ session.OrderExecutor = &ExchangeOrderExecutor{
// copy the notification system so that we can route // copy the notification system so that we can route
Session: session, Session: session,

16
pkg/server/routes.go
View File

@ -405,20 +405,8 @@ func (s *Server) getSessionAccountBalance(c *gin.Context) {
} }
func (s *Server) listSessionOpenOrders(c *gin.Context) { func (s *Server) listSessionOpenOrders(c *gin.Context) {
sessionName := c.Param("session") // FIXME
session, ok := s.Environ.Session(sessionName) c.JSON(http.StatusOK, gin.H{"orders": nil})
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})
} }
func genFakeAssets() types.AssetMap { func genFakeAssets() types.AssetMap {