Skip to content

Commit 99f79f4

Browse files
Add new proeprty to ExchangeTicker that contains response JSON. This … (#593)
* Add new proeprty to ExchangeTicker that contains response JSON. This to get additional data (if needed and provided) * Change ApiResponseString to ApiResponse of type JToken. * Update properrty desccription
1 parent 1356191 commit 99f79f4

File tree

13 files changed

+3072
-2932
lines changed

13 files changed

+3072
-2932
lines changed

src/ExchangeSharp/API/Exchanges/Aquanow/ExchangeAquanowAPI.cs

Lines changed: 224 additions & 233 deletions
Large diffs are not rendered by default.

src/ExchangeSharp/API/Exchanges/BitBank/ExchangeBitBankAPI.cs

Lines changed: 394 additions & 382 deletions
Large diffs are not rendered by default.

src/ExchangeSharp/API/Exchanges/Bitfinex/ExchangeBitfinexAPI.cs

Lines changed: 233 additions & 119 deletions
Large diffs are not rendered by default.

src/ExchangeSharp/API/Exchanges/Bittrex/ExchangeBittrexAPI_WebSocket.cs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ namespace ExchangeSharp
3232
{
3333
public partial class ExchangeBittrexAPI
3434
{
35-
3635
#if HAS_SIGNALR
3736

3837
/// <summary>
@@ -78,7 +77,7 @@ public async Task<IWebSocket> SubscribeToExchangeDeltasAsync(Func<string, Task>
7877
}
7978
}
8079

81-
private BittrexWebSocketManager webSocket;
80+
private BittrexWebSocketManager webSocket;
8281

8382
public static string ReverseMarketNameForWS(string WebSocketFeedMarketName)
8483
{
@@ -96,10 +95,11 @@ protected override async Task<IWebSocket> OnGetTickersWebSocketAsync(Action<IRea
9695
async Task innerCallback(string json)
9796
{
9897
#region sample json
98+
9999
/*
100100
{
101101
Nonce : int,
102-
Deltas :
102+
Deltas :
103103
[
104104
{
105105
MarketName : string,
@@ -119,15 +119,14 @@ async Task innerCallback(string json)
119119
]
120120
}
121121
*/
122-
#endregion
122+
123+
#endregion sample json
123124

124125
var freshTickers = new Dictionary<string, ExchangeTicker>(StringComparer.OrdinalIgnoreCase);
125126
JToken token = JToken.Parse(json);
126127
token = token["D"];
127128
foreach (JToken ticker in token)
128129
{
129-
130-
131130
string marketName = ReverseMarketNameForWS(ticker["M"].ToStringInvariant());
132131
if (filter.Count != 0 && !filter.Contains(marketName))
133132
{
@@ -143,6 +142,7 @@ async Task innerCallback(string json)
143142
var t = new ExchangeTicker
144143
{
145144
MarketSymbol = marketName,
145+
ApiResponse = ticker,
146146
Ask = ask,
147147
Bid = bid,
148148
Last = last,
@@ -176,27 +176,28 @@ params string[] marketSymbols
176176
Task innerCallback(string json)
177177
{
178178
#region sample json
179+
179180
/*
180181
{
181182
MarketName : string,
182183
Nonce : int,
183-
Buys:
184+
Buys:
184185
[
185186
{
186187
Type : int,
187188
Rate : decimal,
188189
Quantity : decimal
189190
}
190191
],
191-
Sells:
192+
Sells:
192193
[
193194
{
194195
Type : int,
195196
Rate : decimal,
196197
Quantity : decimal
197198
}
198199
],
199-
Fills:
200+
Fills:
200201
[
201202
{
202203
FillId : int,
@@ -208,7 +209,8 @@ Task innerCallback(string json)
208209
]
209210
}
210211
*/
211-
#endregion
212+
213+
#endregion sample json
212214

213215
var ordersUpdates = JsonConvert.DeserializeObject<BittrexStreamUpdateExchangeState>(json);
214216
var book = new ExchangeOrderBook();
@@ -229,8 +231,8 @@ Task innerCallback(string json)
229231
return Task.CompletedTask;
230232
}
231233

232-
return await new BittrexWebSocketManager().SubscribeToExchangeDeltasAsync(innerCallback, marketSymbols);
233-
}
234+
return await new BittrexWebSocketManager().SubscribeToExchangeDeltasAsync(innerCallback, marketSymbols);
235+
}
234236

235237
protected override async Task<IWebSocket> OnGetTradesWebSocketAsync(Func<KeyValuePair<string, ExchangeTrade>, Task> callback, params string[] marketSymbols)
236238
{
@@ -261,19 +263,17 @@ async Task innerCallback(string json)
261263

262264
#endif
263265

264-
protected override void OnDispose()
265-
{
266-
266+
protected override void OnDispose()
267+
{
267268
#if HAS_SIGNALR
268269

269-
if (webSocket != null)
270-
{
271-
webSocket.Dispose();
272-
webSocket = null;
273-
}
270+
if (webSocket != null)
271+
{
272+
webSocket.Dispose();
273+
webSocket = null;
274+
}
274275

275276
#endif
276-
277-
}
278-
}
277+
}
278+
}
279279
}

0 commit comments

Comments
 (0)