mirror of
https://github.com/c9s/bbgo.git
synced 2024-11-10 09:11:55 +00:00
avoid using last trade id for syncing data
This commit is contained in:
parent
43c7da59f8
commit
c3dbb1b204
|
@ -703,6 +703,7 @@ func (e *Exchange) QueryTrades(ctx context.Context, symbol string, options *type
|
|||
if options.EndTime != nil {
|
||||
req.EndTime(options.EndTime.UnixNano() / int64(time.Millisecond))
|
||||
}
|
||||
|
||||
if options.LastTradeID > 0 {
|
||||
req.FromID(options.LastTradeID)
|
||||
}
|
||||
|
|
|
@ -81,18 +81,14 @@ func (s *SyncService) SyncTrades(ctx context.Context, exchange types.Exchange, s
|
|||
return err
|
||||
}
|
||||
|
||||
var lastID int64 = 0
|
||||
if lastTrade != nil {
|
||||
lastID = lastTrade.ID
|
||||
startTime = time.Time(lastTrade.Time)
|
||||
|
||||
logrus.Infof("found last trade, start from lastID = %d since %s", lastID, startTime)
|
||||
startTime = time.Time(lastTrade.Time).Add(time.Millisecond)
|
||||
logrus.Infof("found last trade, start from lastID = %d since %s", lastTrade.ID, startTime)
|
||||
}
|
||||
|
||||
batch := &types.ExchangeBatchProcessor{Exchange: exchange}
|
||||
tradeC, errC := batch.BatchQueryTrades(ctx, symbol, &types.TradeQueryOptions{
|
||||
StartTime: &startTime,
|
||||
LastTradeID: lastID,
|
||||
})
|
||||
|
||||
for trade := range tradeC {
|
||||
|
|
|
@ -120,8 +120,6 @@ func (e ExchangeBatchProcessor) BatchQueryTrades(ctx context.Context, symbol str
|
|||
startTime = *options.StartTime
|
||||
}
|
||||
|
||||
var lastTradeID = options.LastTradeID
|
||||
|
||||
go func() {
|
||||
limiter := rate.NewLimiter(rate.Every(5*time.Second), 2) // from binance (original 1200, use 1000 for safety)
|
||||
|
||||
|
@ -138,7 +136,7 @@ func (e ExchangeBatchProcessor) BatchQueryTrades(ctx context.Context, symbol str
|
|||
trades, err := e.QueryTrades(ctx, symbol, &TradeQueryOptions{
|
||||
StartTime: &startTime,
|
||||
Limit: options.Limit,
|
||||
LastTradeID: lastTradeID,
|
||||
// LastTradeID: lastTradeID,
|
||||
})
|
||||
if err != nil {
|
||||
errC <- err
|
||||
|
@ -149,21 +147,13 @@ func (e ExchangeBatchProcessor) BatchQueryTrades(ctx context.Context, symbol str
|
|||
break
|
||||
}
|
||||
|
||||
if len(trades) == 1 && trades[0].ID == lastTradeID {
|
||||
break
|
||||
}
|
||||
|
||||
logrus.Infof("returned %d trades", len(trades))
|
||||
|
||||
startTime = time.Time(trades[len(trades)-1].Time)
|
||||
// increase the window to the next time frame by adding 1 millisecond
|
||||
startTime = time.Time(trades[len(trades)-1].Time).Add(time.Millisecond)
|
||||
for _, t := range trades {
|
||||
// ignore the first trade if last TradeID is given
|
||||
if t.ID == lastTradeID {
|
||||
continue
|
||||
}
|
||||
|
||||
c <- t
|
||||
lastTradeID = t.ID
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
|
Loading…
Reference in New Issue
Block a user