mirror of
https://github.com/c9s/bbgo.git
synced 2024-11-10 09:11:55 +00:00
core: setting.InitializeConverter could return a nil converter object
This commit is contained in:
parent
098de2245c
commit
3d7453f18c
|
@ -43,13 +43,14 @@ type ConverterManager struct {
|
||||||
|
|
||||||
func (c *ConverterManager) Initialize() error {
|
func (c *ConverterManager) Initialize() error {
|
||||||
for _, setting := range c.ConverterSettings {
|
for _, setting := range c.ConverterSettings {
|
||||||
|
|
||||||
converter, err := setting.InitializeConverter()
|
converter, err := setting.InitializeConverter()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
c.AddConverter(converter)
|
if converter != nil {
|
||||||
|
c.AddConverter(converter)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -9,6 +9,28 @@ import (
|
||||||
"github.com/c9s/bbgo/pkg/types"
|
"github.com/c9s/bbgo/pkg/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func TestTradeCollector_NilConvertManager(t *testing.T) {
|
||||||
|
symbol := "BTCUSDT"
|
||||||
|
position := types.NewPosition(symbol, "BTC", "USDT")
|
||||||
|
orderStore := NewOrderStore(symbol)
|
||||||
|
collector := NewTradeCollector(symbol, position, orderStore)
|
||||||
|
|
||||||
|
trade := types.Trade{
|
||||||
|
ID: 1,
|
||||||
|
OrderID: 399,
|
||||||
|
Exchange: types.ExchangeBinance,
|
||||||
|
Price: fixedpoint.NewFromInt(40000),
|
||||||
|
Quantity: fixedpoint.One,
|
||||||
|
QuoteQuantity: fixedpoint.NewFromInt(40000),
|
||||||
|
Symbol: "BTCUSDT",
|
||||||
|
Side: types.SideTypeBuy,
|
||||||
|
IsBuyer: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
trade = collector.ConvertTrade(trade)
|
||||||
|
assert.Equal(t, "BTCUSDT", trade.Symbol)
|
||||||
|
}
|
||||||
|
|
||||||
func TestTradeCollector_ShouldNotCountDuplicatedTrade(t *testing.T) {
|
func TestTradeCollector_ShouldNotCountDuplicatedTrade(t *testing.T) {
|
||||||
symbol := "BTCUSDT"
|
symbol := "BTCUSDT"
|
||||||
position := types.NewPosition(symbol, "BTC", "USDT")
|
position := types.NewPosition(symbol, "BTC", "USDT")
|
||||||
|
|
|
@ -190,6 +190,7 @@ func (p *Position) NewMarketCloseOrder(percentage fixedpoint.Value) *SubmitOrder
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IsDust checks if the position is dust, the first argument is the price to calculate the dust quantity
|
||||||
func (p *Position) IsDust(a ...fixedpoint.Value) bool {
|
func (p *Position) IsDust(a ...fixedpoint.Value) bool {
|
||||||
price := p.AverageCost
|
price := p.AverageCost
|
||||||
if len(a) > 0 {
|
if len(a) > 0 {
|
||||||
|
@ -448,6 +449,7 @@ func (p *Position) String() string {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// BindStream binds the trade update callback and update the position
|
||||||
func (p *Position) BindStream(stream Stream) {
|
func (p *Position) BindStream(stream Stream) {
|
||||||
stream.OnTradeUpdate(func(trade Trade) {
|
stream.OnTradeUpdate(func(trade Trade) {
|
||||||
if p.Symbol == trade.Symbol {
|
if p.Symbol == trade.Symbol {
|
||||||
|
@ -540,7 +542,7 @@ func (p *Position) AddTrade(td Trade) (profit fixedpoint.Value, netProfit fixedp
|
||||||
p.addTradeFee(td)
|
p.addTradeFee(td)
|
||||||
|
|
||||||
// Base > 0 means we're in long position
|
// Base > 0 means we're in long position
|
||||||
// Base < 0 means we're in short position
|
// Base < 0 means we're in short position
|
||||||
switch td.Side {
|
switch td.Side {
|
||||||
|
|
||||||
case SideTypeBuy:
|
case SideTypeBuy:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user