Skip to content

Commit d144568

Browse files
committed
Update to the latest oatpp API.
1 parent 49b746f commit d144568

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

client-binance.com/src/AggregateTradesListener.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
/**
99
* Listener for Aggregate Trade events
1010
*/
11-
class AggregateTradesListener : public WSEventListener<AggregateTrade> {
11+
class AggregateTradesListener : public WSEventListener<oatpp::Object<AggregateTrade>> {
1212
public:
1313

1414
AggregateTradesListener(const std::shared_ptr<oatpp::data::mapping::ObjectMapper>& mapper)
15-
: WSEventListener<AggregateTrade>(mapper)
15+
: WSEventListener<oatpp::Object<AggregateTrade>>(mapper)
1616
{}
1717

18-
void onEvent(const AggregateTrade::ObjectWrapper& trade) override {
18+
void onEvent(const oatpp::Object<AggregateTrade>& trade) override {
1919

2020
OATPP_LOGI("AggregateTrades", "%s - quantity=%s, price=%s, time=%d / firstTradeId=%d, lastTradeId=%d",
2121
trade->symbol->c_str(),

client-binance.com/src/KlineCandlestickListener.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
/**
88
* Listener for Trade events
99
*/
10-
class KlineCandlestickListener : public WSEventListener<Candlestick> {
10+
class KlineCandlestickListener : public WSEventListener<oatpp::Object<Candlestick>> {
1111
public:
1212

1313
KlineCandlestickListener(const std::shared_ptr<oatpp::data::mapping::ObjectMapper>& mapper)
14-
: WSEventListener<Candlestick>(mapper)
14+
: WSEventListener<oatpp::Object<Candlestick>>(mapper)
1515
{}
1616

17-
void onEvent(const Candlestick::ObjectWrapper& obj) override {
17+
void onEvent(const oatpp::Object<Candlestick>& obj) override {
1818

1919
OATPP_LOGI("Kline/Candlesticks", "%s - startTime=%d, closeTime=%d / openPrice=%s, closePrice=%s, highPrice=%s, lowPrice=%s",
2020
obj->symbol->c_str(),

client-binance.com/src/Model.hpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
* DTO representing "Aggregate Trade Stream" object from binance-exchange.
1212
* See https://github.com/binance-exchange/binance-official-api-docs/blob/master/web-socket-streams.md#aggregate-trade-streams
1313
*/
14-
class AggregateTrade : public oatpp::Object {
14+
class AggregateTrade : public oatpp::DTO {
1515

16-
DTO_INIT(AggregateTrade, Object)
16+
DTO_INIT(AggregateTrade, DTO)
1717

1818
DTO_FIELD(String, eventType, "e");
1919
DTO_FIELD(Int64, eventTime, "E");
@@ -33,9 +33,9 @@ class AggregateTrade : public oatpp::Object {
3333
* DTO representing "Trade Stream" object from binance-exchange.
3434
* See https://github.com/binance-exchange/binance-official-api-docs/blob/master/web-socket-streams.md#trade-streams
3535
*/
36-
class Trade : public oatpp::Object {
36+
class Trade : public oatpp::DTO {
3737

38-
DTO_INIT(Trade, Object)
38+
DTO_INIT(Trade, DTO)
3939

4040
DTO_FIELD(String, eventType, "e");
4141
DTO_FIELD(Int64, eventTime, "E");
@@ -54,9 +54,9 @@ class Trade : public oatpp::Object {
5454
/**
5555
* Nested object for Candlestick
5656
*/
57-
class Kline : public oatpp::Object {
57+
class Kline : public oatpp::DTO {
5858

59-
DTO_INIT(Kline, Object)
59+
DTO_INIT(Kline, DTO)
6060

6161
DTO_FIELD(Int64, klineStartTime, "t");
6262
DTO_FIELD(Int64, klineCloseTime, "T");
@@ -86,14 +86,14 @@ class Kline : public oatpp::Object {
8686
* DTO representing "Kline/Candlestick Stream" object from binance-exchange.
8787
* See https://github.com/binance-exchange/binance-official-api-docs/blob/master/web-socket-streams.md#klinecandlestick-streams
8888
*/
89-
class Candlestick : public oatpp::Object {
89+
class Candlestick : public oatpp::DTO {
9090

91-
DTO_INIT(Candlestick, Object)
91+
DTO_INIT(Candlestick, DTO)
9292

9393
DTO_FIELD(String, eventType, "e");
9494
DTO_FIELD(Int64, eventTime, "E");
9595
DTO_FIELD(String, symbol, "s");
96-
DTO_FIELD(Kline::ObjectWrapper, kline, "k");
96+
DTO_FIELD(Object<Kline>, kline, "k");
9797

9898
};
9999

client-binance.com/src/TradesListener.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
/**
99
* Listener for Trade events
1010
*/
11-
class TradesListener : public WSEventListener<Trade> {
11+
class TradesListener : public WSEventListener<oatpp::Object<Trade>> {
1212
public:
1313

1414
TradesListener(const std::shared_ptr<oatpp::data::mapping::ObjectMapper>& mapper)
15-
: WSEventListener<Trade>(mapper)
15+
: WSEventListener<oatpp::Object<Trade>>(mapper)
1616
{}
1717

18-
void onEvent(const Trade::ObjectWrapper& trade) override {
18+
void onEvent(const oatpp::Object<Trade>& trade) override {
1919

2020
OATPP_LOGI("Trades", "%s - quantity=%s, price=%s, time=%d",
2121
trade->symbol->c_str(),

client-binance.com/src/WSEventListener.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class WSEventListener : public WSListener {
2626
onEvent(eventObject);
2727
}
2828

29-
virtual void onEvent(const typename T::ObjectWrapper& eventObject) = 0;
29+
virtual void onEvent(const T& eventObject) = 0;
3030

3131
};
3232

0 commit comments

Comments
 (0)