mirror of
https://github.com/NoFxAiOS/nofx.git
synced 2026-07-12 15:26:55 +08:00
fix: Remove merge conflict markers and add WebSocket limit warnings
- Clean up remaining conflict markers in SetMarginMode - Add visual warnings for WebSocket stream limits in UI - Prevent user from exceeding 250 symbols (1024 streams / 4 timeframes)
This commit is contained in:
@@ -214,19 +214,12 @@ func (t *FuturesTrader) SetMarginMode(symbol string, isCrossMargin bool) error {
|
||||
}
|
||||
|
||||
// 尝试设置仓位模式
|
||||
<<<<<<< HEAD
|
||||
err := t.client.NewChangeMarginTypeService().
|
||||
Symbol(symbol).
|
||||
MarginType(marginType).
|
||||
Do(context.Background())
|
||||
=======
|
||||
err := t.callWithTimeSync("设置仓位模式", func() error {
|
||||
return t.client.NewChangeMarginTypeService().
|
||||
Symbol(symbol).
|
||||
MarginType(marginType).
|
||||
Do(context.Background())
|
||||
})
|
||||
>>>>>>> pr-313-time-sync
|
||||
|
||||
marginModeStr := "全仓"
|
||||
if !isCrossMargin {
|
||||
|
||||
Reference in New Issue
Block a user