Skip to content
This repository has been archived by the owner on Jul 4, 2024. It is now read-only.

Commit

Permalink
remove f64
Browse files Browse the repository at this point in the history
  • Loading branch information
@larscom
larscom committed Dec 2, 2023
1 parent 50f2f84 commit 3e336bd
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 35 deletions.
6 changes: 3 additions & 3 deletions jsond/account.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ func (f *Fee) UnmarshalJSON(bytes []byte) error {
volume = j["volume"]
)

f.Taker = util.IfOrElse(len(taker) > 0, func() float64 { return util.MustFloat64(taker) }, float64(0))
f.Maker = util.IfOrElse(len(maker) > 0, func() float64 { return util.MustFloat64(maker) }, float64(0))
f.Volume = util.IfOrElse(len(volume) > 0, func() float64 { return util.MustFloat64(volume) }, float64(0))
f.Taker = util.IfOrElse(len(taker) > 0, func() float64 { return util.MustFloat64(taker) }, 0)
f.Maker = util.IfOrElse(len(maker) > 0, func() float64 { return util.MustFloat64(maker) }, 0)
f.Volume = util.IfOrElse(len(volume) > 0, func() float64 { return util.MustFloat64(volume) }, 0)

return nil
}
4 changes: 2 additions & 2 deletions jsond/balance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ func (b *Balance) UnmarshalJSON(bytes []byte) error {
)

b.Symbol = symbol
b.Available = util.IfOrElse(len(available) > 0, func() float64 { return util.MustFloat64(available) }, float64(0))
b.InOrder = util.IfOrElse(len(inOrder) > 0, func() float64 { return util.MustFloat64(inOrder) }, float64(0))
b.Available = util.IfOrElse(len(available) > 0, func() float64 { return util.MustFloat64(available) }, 0)
b.InOrder = util.IfOrElse(len(inOrder) > 0, func() float64 { return util.MustFloat64(inOrder) }, 0)

return nil
}
18 changes: 9 additions & 9 deletions wsc/account.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ func (o *OrderEvent) UnmarshalJSON(bytes []byte) error {
Status: status,
Side: side,
OrderType: orderType,
Amount: util.IfOrElse(len(amount) > 0, func() float64 { return util.MustFloat64(amount) }, float64(0)),
AmountRemaining: util.IfOrElse(len(amountRemaining) > 0, func() float64 { return util.MustFloat64(amountRemaining) }, float64(0)),
Price: util.IfOrElse(len(price) > 0, func() float64 { return util.MustFloat64(price) }, float64(0)),
OnHold: util.IfOrElse(len(onHold) > 0, func() float64 { return util.MustFloat64(onHold) }, float64(0)),
Amount: util.IfOrElse(len(amount) > 0, func() float64 { return util.MustFloat64(amount) }, 0),
AmountRemaining: util.IfOrElse(len(amountRemaining) > 0, func() float64 { return util.MustFloat64(amountRemaining) }, 0),
Price: util.IfOrElse(len(price) > 0, func() float64 { return util.MustFloat64(price) }, 0),
OnHold: util.IfOrElse(len(onHold) > 0, func() float64 { return util.MustFloat64(onHold) }, 0),
OnHoldCurrency: onHoldCurrency,
TriggerPrice: util.IfOrElse(len(triggerPrice) > 0, func() float64 { return util.MustFloat64(triggerPrice) }, float64(0)),
TriggerAmount: util.IfOrElse(len(triggerAmount) > 0, func() float64 { return util.MustFloat64(triggerAmount) }, float64(0)),
TriggerPrice: util.IfOrElse(len(triggerPrice) > 0, func() float64 { return util.MustFloat64(triggerPrice) }, 0),
TriggerAmount: util.IfOrElse(len(triggerAmount) > 0, func() float64 { return util.MustFloat64(triggerAmount) }, 0),
TriggerType: triggerType,
TriggerReference: triggerReference,
TimeInForce: timeInForce,
Expand Down Expand Up @@ -123,11 +123,11 @@ func (f *FillEvent) UnmarshalJSON(bytes []byte) error {
OrderId: orderId,
FillId: fillId,
Timestamp: int64(timestamp),
Amount: util.IfOrElse(len(amount) > 0, func() float64 { return util.MustFloat64(amount) }, float64(0)),
Amount: util.IfOrElse(len(amount) > 0, func() float64 { return util.MustFloat64(amount) }, 0),
Side: side,
Price: util.IfOrElse(len(price) > 0, func() float64 { return util.MustFloat64(price) }, float64(0)),
Price: util.IfOrElse(len(price) > 0, func() float64 { return util.MustFloat64(price) }, 0),
Taker: taker,
Fee: util.IfOrElse(len(fee) > 0, func() float64 { return util.MustFloat64(fee) }, float64(0)),
Fee: util.IfOrElse(len(fee) > 0, func() float64 { return util.MustFloat64(fee) }, 0),
FeeCurrency: feeCurrency,
}

Expand Down
8 changes: 4 additions & 4 deletions wsc/book.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ func (b *BookEvent) UnmarshalJSON(bytes []byte) error {
size := bidEvents[i].([]any)[1].(string)

bids[i] = jsond.Page{
Price: util.IfOrElse(len(price) > 0, func() float64 { return util.MustFloat64(price) }, float64(0)),
Size: util.IfOrElse(len(size) > 0, func() float64 { return util.MustFloat64(size) }, float64(0)),
Price: util.IfOrElse(len(price) > 0, func() float64 { return util.MustFloat64(price) }, 0),
Size: util.IfOrElse(len(size) > 0, func() float64 { return util.MustFloat64(size) }, 0),
}
}

Expand All @@ -54,8 +54,8 @@ func (b *BookEvent) UnmarshalJSON(bytes []byte) error {
size := askEvents[i].([]any)[1].(string)

asks[i] = jsond.Page{
Price: util.IfOrElse(len(price) > 0, func() float64 { return util.MustFloat64(price) }, float64(0)),
Size: util.IfOrElse(len(size) > 0, func() float64 { return util.MustFloat64(size) }, float64(0)),
Price: util.IfOrElse(len(price) > 0, func() float64 { return util.MustFloat64(price) }, 0),
Size: util.IfOrElse(len(size) > 0, func() float64 { return util.MustFloat64(size) }, 0),
}
}

Expand Down
10 changes: 5 additions & 5 deletions wsc/ticker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ func (t *TickerEvent) UnmarshalJSON(bytes []byte) error {

t.Market = market
t.Ticker = jsond.Ticker{
BestBid: util.IfOrElse(len(bestBid) > 0, func() float64 { return util.MustFloat64(bestBid) }, float64(0)),
BestBidSize: util.IfOrElse(len(bestBidSize) > 0, func() float64 { return util.MustFloat64(bestBidSize) }, float64(0)),
BestAsk: util.IfOrElse(len(bestAsk) > 0, func() float64 { return util.MustFloat64(bestAsk) }, float64(0)),
BestAskSize: util.IfOrElse(len(bestAskSize) > 0, func() float64 { return util.MustFloat64(bestAskSize) }, float64(0)),
LastPrice: util.IfOrElse(len(lastPrice) > 0, func() float64 { return util.MustFloat64(lastPrice) }, float64(0)),
BestBid: util.IfOrElse(len(bestBid) > 0, func() float64 { return util.MustFloat64(bestBid) }, 0),
BestBidSize: util.IfOrElse(len(bestBidSize) > 0, func() float64 { return util.MustFloat64(bestBidSize) }, 0),
BestAsk: util.IfOrElse(len(bestAsk) > 0, func() float64 { return util.MustFloat64(bestAsk) }, 0),
BestAskSize: util.IfOrElse(len(bestAskSize) > 0, func() float64 { return util.MustFloat64(bestAskSize) }, 0),
LastPrice: util.IfOrElse(len(lastPrice) > 0, func() float64 { return util.MustFloat64(lastPrice) }, 0),
}

return nil
Expand Down
20 changes: 10 additions & 10 deletions wsc/ticker24h.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@ func (t *Ticker24hEvent) UnmarshalJSON(bytes []byte) error {
t.Event = event
t.Market = market
t.Ticker24h = jsond.Ticker24h{
Open: util.IfOrElse(len(open) > 0, func() float64 { return util.MustFloat64(open) }, float64(0)),
High: util.IfOrElse(len(high) > 0, func() float64 { return util.MustFloat64(high) }, float64(0)),
Low: util.IfOrElse(len(low) > 0, func() float64 { return util.MustFloat64(low) }, float64(0)),
Last: util.IfOrElse(len(last) > 0, func() float64 { return util.MustFloat64(last) }, float64(0)),
Volume: util.IfOrElse(len(volume) > 0, func() float64 { return util.MustFloat64(volume) }, float64(0)),
VolumeQuote: util.IfOrElse(len(volumeQuote) > 0, func() float64 { return util.MustFloat64(volumeQuote) }, float64(0)),
Bid: util.IfOrElse(len(bid) > 0, func() float64 { return util.MustFloat64(bid) }, float64(0)),
BidSize: util.IfOrElse(len(bidSize) > 0, func() float64 { return util.MustFloat64(bidSize) }, float64(0)),
Ask: util.IfOrElse(len(ask) > 0, func() float64 { return util.MustFloat64(ask) }, float64(0)),
AskSize: util.IfOrElse(len(askSize) > 0, func() float64 { return util.MustFloat64(askSize) }, float64(0)),
Open: util.IfOrElse(len(open) > 0, func() float64 { return util.MustFloat64(open) }, 0),
High: util.IfOrElse(len(high) > 0, func() float64 { return util.MustFloat64(high) }, 0),
Low: util.IfOrElse(len(low) > 0, func() float64 { return util.MustFloat64(low) }, 0),
Last: util.IfOrElse(len(last) > 0, func() float64 { return util.MustFloat64(last) }, 0),
Volume: util.IfOrElse(len(volume) > 0, func() float64 { return util.MustFloat64(volume) }, 0),
VolumeQuote: util.IfOrElse(len(volumeQuote) > 0, func() float64 { return util.MustFloat64(volumeQuote) }, 0),
Bid: util.IfOrElse(len(bid) > 0, func() float64 { return util.MustFloat64(bid) }, 0),
BidSize: util.IfOrElse(len(bidSize) > 0, func() float64 { return util.MustFloat64(bidSize) }, 0),
Ask: util.IfOrElse(len(ask) > 0, func() float64 { return util.MustFloat64(ask) }, 0),
AskSize: util.IfOrElse(len(askSize) > 0, func() float64 { return util.MustFloat64(askSize) }, 0),
Timestamp: int64(timestamp),
StartTimestamp: int64(startTimestamp),
OpenTimestamp: int64(openTimestamp),
Expand Down
4 changes: 2 additions & 2 deletions wsc/trades.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ func (t *TradesEvent) UnmarshalJSON(bytes []byte) error {
t.Market = market
t.Trade = jsond.Trade{
Id: id,
Amount: util.IfOrElse(len(amount) > 0, func() float64 { return util.MustFloat64(amount) }, float64(0)),
Price: util.IfOrElse(len(price) > 0, func() float64 { return util.MustFloat64(price) }, float64(0)),
Amount: util.IfOrElse(len(amount) > 0, func() float64 { return util.MustFloat64(amount) }, 0),
Price: util.IfOrElse(len(price) > 0, func() float64 { return util.MustFloat64(price) }, 0),
Side: side,
Timestamp: int64(timestamp),
}
Expand Down

0 comments on commit 3e336bd

Please sign in to comment.