Skip to content

Commit

Permalink
xdepthmaker: pull out until argument
Browse files Browse the repository at this point in the history
  • Loading branch information
c9s committed Mar 5, 2024
1 parent a518cf7 commit 4bed29a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
14 changes: 5 additions & 9 deletions pkg/strategy/xdepthmaker/profitfixer.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,27 +37,23 @@ func (f *ProfitFixer) batchQueryTrades(
ctx context.Context,
service types.ExchangeTradeHistoryService,
symbol string,
since time.Time,
since, until time.Time,
) ([]types.Trade, error) {

now := time.Now()
q := &batch.TradeBatchQuery{ExchangeTradeHistoryService: service}
trades, err := q.QueryTrades(ctx, symbol, &types.TradeQueryOptions{
return q.QueryTrades(ctx, symbol, &types.TradeQueryOptions{
StartTime: &since,
EndTime: &now,
EndTime: &until,
})

return trades, err
}

func (f *ProfitFixer) Fix(ctx context.Context, since time.Time, stats *types.ProfitStats, position *types.Position) error {
func (f *ProfitFixer) Fix(ctx context.Context, since, until time.Time, stats *types.ProfitStats, position *types.Position) error {
var mu sync.Mutex
var allTrades = make([]types.Trade, 0, 1000)

g, subCtx := errgroup.WithContext(ctx)
for _, service := range f.sessions {
g.Go(func() error {
trades, err := f.batchQueryTrades(subCtx, service, f.market.Symbol, since)
trades, err := f.batchQueryTrades(subCtx, service, f.market.Symbol, since, until)
if err != nil {
log.WithError(err).Errorf("unable to batch query trades for fixer")
return err
Expand Down
4 changes: 2 additions & 2 deletions pkg/strategy/xdepthmaker/strategy.go
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@ func (s *Strategy) CrossRun(

s.CrossExchangeMarketMakingStrategy.Position = types.NewPositionFromMarket(s.makerMarket)
s.CrossExchangeMarketMakingStrategy.ProfitStats = types.NewProfitStats(s.makerMarket)
if err2 := fixer.Fix(ctx, s.ProfitFixerConfig.TradesSince.Time(), s.CrossExchangeMarketMakingStrategy.ProfitStats, s.CrossExchangeMarketMakingStrategy.Position); err2 != nil {

if err2 := fixer.Fix(ctx, s.ProfitFixerConfig.TradesSince.Time(), time.Now(), s.CrossExchangeMarketMakingStrategy.ProfitStats, s.CrossExchangeMarketMakingStrategy.Position); err2 != nil {
return err2
}
}
Expand Down

0 comments on commit 4bed29a

Please sign in to comment.