mirror of
https://github.com/JKorf/CryptoExchange.Net.git
synced 2026-08-11 16:32:57 +00:00
Squashed commit of the following:
commit 1ca93ce870468c7effcc69a05b1675f855598f3e Author: Jkorf <jankorf91@gmail.com> Date: Thu Aug 12 13:44:03 2021 +0200 Version 4.0.0 release commit f8cefe72cae8b845aa995d16415f160228f5dfc4 Author: Jkorf <jankorf91@gmail.com> Date: Mon Aug 9 11:46:50 2021 +0200 Fix for processing a duplicate message in symbol order book commit f3573e414f80ea622caadb38f9e020f2eab7c834 Author: Jkorf <jankorf91@gmail.com> Date: Mon Aug 9 11:36:50 2021 +0200 Updated version commit 170a3b5c83cd500f0adb5cf74eaaa9c1a8674a10 Merge: 73a0e2c 0d43f6e Author: Jkorf <jankorf91@gmail.com> Date: Mon Aug 9 11:33:59 2021 +0200 Merge branch 'feature/replace-websocket4net' of https://github.com/JKorf/CryptoExchange.Net into feature/replace-websocket4net commit 73a0e2cb62f8d51b4b8fe1b29fbf16f07ebf13e0 Author: Jkorf <jankorf91@gmail.com> Date: Mon Aug 9 11:33:45 2021 +0200 Fixed processing issue in SymbolOrderBook commit 0d43f6e14e9b61af9bb3250fd72559a5fbf5300a Author: Jan Korf <jankorf91@gmail.com> Date: Sat Jul 31 14:48:23 2021 +0200 Updated version commit 037d765fc73740d2aa2159bce6d57f01d989bdc2 Author: Jan Korf <jankorf91@gmail.com> Date: Sat Jul 31 11:14:42 2021 +0200 Socket fixes commit 13cf3e27b9e91b252368a5dc799363111eed9148 Author: Jkorf <jankorf91@gmail.com> Date: Mon Jul 26 09:55:51 2021 +0200 Updated version commit 333c6c4207cafbfd09b37743fb36008f87939666 Author: Jkorf <jankorf91@gmail.com> Date: Mon Jul 26 09:50:35 2021 +0200 Update CryptoExchangeWebSocketClient.cs commit ad2b6284b042cfa846e55f8b5f53b2397039dff7 Merge: 64bdcdf 2591cc6 Author: Jan Korf <jankorf91@gmail.com> Date: Sun Jul 25 22:44:49 2021 +0200 Merge branch 'feature/replace-websocket4net' of https://github.com/jkorf/CryptoExchange.Net into feature/replace-websocket4net commit 64bdcdf087d56b8470baedac1ac86d263ad72490 Author: Jan Korf <jankorf91@gmail.com> Date: Sun Jul 25 22:44:03 2021 +0200 Fix for deadlock commit 2591cc6782e281595c436ccb4b74a9c7c7f5dc57 Author: Jkorf <jankorf91@gmail.com> Date: Thu Jul 15 15:10:08 2021 +0200 Cleanup commit b3b6235b6edf0ea1a6437239919666d08c274129 Author: Jkorf <jankorf91@gmail.com> Date: Fri Jul 9 16:14:33 2021 +0200 Updated version commit 12975fd13f7884382fea608d774b1e0ac384cb70 Author: Jkorf <jankorf91@gmail.com> Date: Fri Jul 9 16:12:04 2021 +0200 Async postfix for order book methods commit d49d59094e18c83de994a1b591f906f7efe916c5 Author: Jkorf <jankorf91@gmail.com> Date: Fri Jul 9 15:47:38 2021 +0200 Renamed async methods with Async post fixes commit cbe103930ab90378507780cb150596abcb15eb3f Author: Jkorf <jankorf91@gmail.com> Date: Thu Jul 8 09:29:34 2021 +0200 Added Book property on SymbolOrderBook commit ecc101aed11bab73c49fadc93d3ca4607094d92a Merge: 181f942 a172461 Author: Jan Korf <jankorf91@gmail.com> Date: Wed Jul 7 23:38:58 2021 +0200 Merge branch 'feature/replace-websocket4net' of https://github.com/jkorf/CryptoExchange.Net into feature/replace-websocket4net commit 181f942e2137ff5dfede5365012e24dfb2f07cf9 Author: Jan Korf <jankorf91@gmail.com> Date: Wed Jul 7 23:38:49 2021 +0200 Added CalculateAverageFillPrice to order book commit a17246153df463aa881e9808ffb87fa25f144d90 Author: Jkorf <jankorf91@gmail.com> Date: Wed Jul 7 13:11:39 2021 +0200 Updated version commit c60f138ae846a991662e7544d45845decd25cc10 Author: Jkorf <jankorf91@gmail.com> Date: Wed Jul 7 13:05:44 2021 +0200 Fix not logging responses with LogLevel.Debug commit 91f168fd25150b3048346bcc6acc549ee3685e50 Author: Jkorf <jankorf91@gmail.com> Date: Mon Jul 5 10:39:48 2021 +0200 Added ExchangeHelpers to ReadMe commit ff6c02e574d3f8a270e2960fdda0222c53457868 Author: Jkorf <jankorf91@gmail.com> Date: Mon Jul 5 10:34:25 2021 +0200 Added some helper methods, some code comments commit 55900a3db938f032436303c2399f41b7a3a5fef1 Merge: 9067a8a7ab6bb0Author: Jkorf <jankorf91@gmail.com> Date: Mon Jul 5 09:24:43 2021 +0200 Merge branch 'master' into feature/replace-websocket4net commit 9067a8a82c5d8c1e1f6ba0f2600539efd7f1a122 Author: Jkorf <jankorf91@gmail.com> Date: Fri Jul 2 16:03:38 2021 +0200 Update README.md commit 0f202d69c7e3db71f66dcfef5673b97f56451a40 Author: Jkorf <jankorf91@gmail.com> Date: Fri Jun 25 16:37:06 2021 +0200 Code comments, added console logger commit 52160c6dc1bbaca3cc498c49ec0dd71310d5102b Author: Jkorf <jankorf91@gmail.com> Date: Thu Jun 24 16:47:04 2021 +0200 Added/cleaned up code comments commit 95771c5c4ae3a74963fea5a01e05559596b1b39d Author: Jkorf <jankorf91@gmail.com> Date: Tue Jun 22 14:22:15 2021 +0200 Additional info socket connection error commit 6a90e2316d54d42c0f5b7772d60d4861ff340c5a Author: Jkorf <jankorf91@gmail.com> Date: Thu Jun 17 16:10:43 2021 +0200 Updated version commit b138c1050372b5d5fbdc3b2a33d3c09b677a669a Author: Jkorf <jankorf91@gmail.com> Date: Thu Jun 17 16:08:19 2021 +0200 Fix not receiving OriginalData in output commit 462f44cf45e1bc7ee333e37ad0a778185d84fa58 Author: Jan Korf <jankorf91@gmail.com> Date: Wed Jun 16 22:35:03 2021 +0200 Fix invalidoperation in order book commit aa7414321b1297487a5133fa0a7e5ede059a6939 Author: Jan Korf <jankorf91@gmail.com> Date: Sun Jun 13 20:56:01 2021 +0200 logging no data task commit 22aa5928f5cb11ac5877bc4c606d64550aad3f0c Author: Jan Korf <jankorf91@gmail.com> Date: Tue Jun 8 19:13:18 2021 +0200 Updated version commit 1ceb22994a5cdf779de8890e39101956728ab80c Author: Jan Korf <jankorf91@gmail.com> Date: Tue Jun 8 19:11:20 2021 +0200 Fixed exception on .net framework when creating socket commit 971cab739dd543de0122c9bc12819f57d4df15e3 Author: Jkorf <jankorf91@gmail.com> Date: Mon Jun 7 14:41:27 2021 +0200 Updated unit test packages commit 216213d5ad0e14c6cd7b8e22131b8b07338bacfc Author: Jkorf <jankorf91@gmail.com> Date: Mon Jun 7 10:46:57 2021 +0200 Updated version commit ce2c7ddc182599c5ca9ef0eb64e14906c8b734e1 Merge: b21970555aa77eAuthor: Jan Korf <jankorf91@gmail.com> Date: Mon Jun 7 09:29:57 2021 +0200 Merge pull request #96 from ridicoulous/master iexchange client improvements commit b21970552602eb853a061034a5c223a381e7465b Author: Jkorf <jankorf91@gmail.com> Date: Tue Jun 1 14:55:02 2021 +0200 Updated version commit dd2cf84c163920e545ec09e1b0d29ab295f2fbe2 Author: Jkorf <jankorf91@gmail.com> Date: Tue Jun 1 14:52:55 2021 +0200 Added tests for LogLevel null commit 975003284f53094750ec3d4a608d814a6d70f745 Author: Jkorf <jankorf91@gmail.com> Date: Tue Jun 1 14:42:59 2021 +0200 Made LogLevel nullable in options, moved log formatting to the ILogger implementation commit 1c1de5651e31e9288b4fd125b0545efbfa9098f7 Merge: 34bf986 e7838ab Author: Jkorf <jankorf91@gmail.com> Date: Mon May 31 10:16:52 2021 +0200 Merge branch 'feature/replace-websocket4net' of https://github.com/JKorf/CryptoExchange.Net into feature/replace-websocket4net commit 34bf9867dcd2c2b195079094560351d0db2dac0f Author: Jkorf <jankorf91@gmail.com> Date: Mon May 31 10:16:49 2021 +0200 fixed some axync issues commit e7838ab9e8310b4ae02c172f0a764aad8ca8fd4e Author: Jan Korf <jankorf91@gmail.com> Date: Wed May 26 13:46:40 2021 +0200 Added Discord link to ReadMe commit 502939f57cf8deac1809c4bd2c63af4acc62bd43 Author: Jan Korf <jankorf91@gmail.com> Date: Wed May 26 11:12:59 2021 +0200 Updated version commit 92b745ca291259eb246572c8029709b87ddbf2d3 Author: Jan Korf <jankorf91@gmail.com> Date: Tue May 25 21:52:47 2021 +0200 Refactored logging to use ILogger commit b4904b5e4a239ffb29f00b13a314fea33d45d9cb Author: Jan Korf <jankorf91@gmail.com> Date: Tue May 25 14:07:01 2021 +0200 Added optional json output, added DataEvent for socket updates commit55aa77e926Author: Artem Kurianov <artemkuryanov@gmail.com> Date: Fri May 14 13:11:05 2021 +0000 added order time commitefe70445edAuthor: Artem Kurianov <artemkuryanov@gmail.com> Date: Fri May 14 13:08:58 2021 +0000 iexchange client improvements commit 8f0943f0f0469b42f40334257f0f3ca5e39e3bd9 Author: Jkorf <jankorf91@gmail.com> Date: Thu May 6 10:24:33 2021 +0200 Updated version commit 17d1e5f71bd1986eea0e8273da070f3615d3e378 Author: Jkorf <jankorf91@gmail.com> Date: Thu May 6 10:01:24 2021 +0200 Added missing configureawaits commit ed748aa474e0d52a78bc15b9b0aa0a9b4d8dd35e Author: Jan Korf <jankorf91@gmail.com> Date: Fri Apr 30 23:00:07 2021 +0200 Updated version commit 1ae545563497889c75ed6183377e759da5beed61 Author: Jan Korf <jankorf91@gmail.com> Date: Fri Apr 30 21:00:40 2021 +0200 Updated socket closing commit 8243ad60dc64f96ed262ec54cbd6c55553c056be Author: Jkorf <jankorf91@gmail.com> Date: Fri Apr 30 15:48:36 2021 +0200 Updated version commit 4299f238f3debc2b1b062eb7cde195a3d64dbdfc Author: Jan Korf <jankorf91@gmail.com> Date: Fri Apr 30 15:44:32 2021 +0200 Fix for closing socket without timeout task commit 71f49cfe5142cb70fb651936e74b8eef5b7350d4 Author: Jkorf <jankorf91@gmail.com> Date: Fri Apr 30 14:59:10 2021 +0200 Updated version commit 5d669068ec0a7241daef383c6867c2e22ec21ed3 Author: Jkorf <jankorf91@gmail.com> Date: Fri Apr 30 14:56:15 2021 +0200 Renaming, cleanup handler -> subscription socket (SocketConnection) -> socketConnection commit 0fa13e286060cd3b96b808406434092c0e89e89d Author: Jkorf <jankorf91@gmail.com> Date: Thu Apr 29 16:20:41 2021 +0200 Initial work replacing Websocket4Net with ClientWebSocket
This commit is contained in:
Jkorf
@@ -1,11 +1,10 @@
|
||||
using CryptoExchange.Net.Authentication;
|
||||
using CryptoExchange.Net.Logging;
|
||||
using CryptoExchange.Net.Objects;
|
||||
using CryptoExchange.Net.UnitTests.TestImplementations;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using NUnit.Framework;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
|
||||
namespace CryptoExchange.Net.UnitTests
|
||||
{
|
||||
@@ -30,54 +29,58 @@ namespace CryptoExchange.Net.UnitTests
|
||||
public void SettingLogOutput_Should_RedirectLogOutput()
|
||||
{
|
||||
// arrange
|
||||
var stringBuilder = new StringBuilder();
|
||||
var logger = new TestStringLogger();
|
||||
var client = new TestBaseClient(new RestClientOptions("")
|
||||
{
|
||||
LogWriters = new List<TextWriter> { new StringWriter(stringBuilder) }
|
||||
LogWriters = new List<ILogger> { logger }
|
||||
});
|
||||
|
||||
// act
|
||||
client.Log(LogVerbosity.Info, "Test");
|
||||
client.Log(LogLevel.Information, "Test");
|
||||
|
||||
// assert
|
||||
Assert.IsFalse(string.IsNullOrEmpty(stringBuilder.ToString()));
|
||||
Assert.IsFalse(string.IsNullOrEmpty(logger.GetLogs()));
|
||||
}
|
||||
|
||||
[TestCase(LogVerbosity.None, LogVerbosity.Error, false)]
|
||||
[TestCase(LogVerbosity.None, LogVerbosity.Warning, false)]
|
||||
[TestCase(LogVerbosity.None, LogVerbosity.Info, false)]
|
||||
[TestCase(LogVerbosity.None, LogVerbosity.Debug, false)]
|
||||
[TestCase(LogVerbosity.Error, LogVerbosity.Error, true)]
|
||||
[TestCase(LogVerbosity.Error, LogVerbosity.Warning, false)]
|
||||
[TestCase(LogVerbosity.Error, LogVerbosity.Info, false)]
|
||||
[TestCase(LogVerbosity.Error, LogVerbosity.Debug, false)]
|
||||
[TestCase(LogVerbosity.Warning, LogVerbosity.Error, true)]
|
||||
[TestCase(LogVerbosity.Warning, LogVerbosity.Warning, true)]
|
||||
[TestCase(LogVerbosity.Warning, LogVerbosity.Info, false)]
|
||||
[TestCase(LogVerbosity.Warning, LogVerbosity.Debug, false)]
|
||||
[TestCase(LogVerbosity.Info, LogVerbosity.Error, true)]
|
||||
[TestCase(LogVerbosity.Info, LogVerbosity.Warning, true)]
|
||||
[TestCase(LogVerbosity.Info, LogVerbosity.Info, true)]
|
||||
[TestCase(LogVerbosity.Info, LogVerbosity.Debug, false)]
|
||||
[TestCase(LogVerbosity.Debug, LogVerbosity.Error, true)]
|
||||
[TestCase(LogVerbosity.Debug, LogVerbosity.Warning, true)]
|
||||
[TestCase(LogVerbosity.Debug, LogVerbosity.Info, true)]
|
||||
[TestCase(LogVerbosity.Debug, LogVerbosity.Debug, true)]
|
||||
public void SettingLogVerbosity_Should_RestrictLogging(LogVerbosity verbosity, LogVerbosity testVerbosity, bool expected)
|
||||
[TestCase(LogLevel.None, LogLevel.Error, false)]
|
||||
[TestCase(LogLevel.None, LogLevel.Warning, false)]
|
||||
[TestCase(LogLevel.None, LogLevel.Information, false)]
|
||||
[TestCase(LogLevel.None, LogLevel.Debug, false)]
|
||||
[TestCase(LogLevel.Error, LogLevel.Error, true)]
|
||||
[TestCase(LogLevel.Error, LogLevel.Warning, false)]
|
||||
[TestCase(LogLevel.Error, LogLevel.Information, false)]
|
||||
[TestCase(LogLevel.Error, LogLevel.Debug, false)]
|
||||
[TestCase(LogLevel.Warning, LogLevel.Error, true)]
|
||||
[TestCase(LogLevel.Warning, LogLevel.Warning, true)]
|
||||
[TestCase(LogLevel.Warning, LogLevel.Information, false)]
|
||||
[TestCase(LogLevel.Warning, LogLevel.Debug, false)]
|
||||
[TestCase(LogLevel.Information, LogLevel.Error, true)]
|
||||
[TestCase(LogLevel.Information, LogLevel.Warning, true)]
|
||||
[TestCase(LogLevel.Information, LogLevel.Information, true)]
|
||||
[TestCase(LogLevel.Information, LogLevel.Debug, false)]
|
||||
[TestCase(LogLevel.Debug, LogLevel.Error, true)]
|
||||
[TestCase(LogLevel.Debug, LogLevel.Warning, true)]
|
||||
[TestCase(LogLevel.Debug, LogLevel.Information, true)]
|
||||
[TestCase(LogLevel.Debug, LogLevel.Debug, true)]
|
||||
[TestCase(null, LogLevel.Error, true)]
|
||||
[TestCase(null, LogLevel.Warning, true)]
|
||||
[TestCase(null, LogLevel.Information, true)]
|
||||
[TestCase(null, LogLevel.Debug, true)]
|
||||
public void SettingLogLevel_Should_RestrictLogging(LogLevel? verbosity, LogLevel testVerbosity, bool expected)
|
||||
{
|
||||
// arrange
|
||||
var stringBuilder = new StringBuilder();
|
||||
var logger = new TestStringLogger();
|
||||
var client = new TestBaseClient(new RestClientOptions("")
|
||||
{
|
||||
LogWriters = new List<TextWriter> { new StringWriter(stringBuilder) },
|
||||
LogVerbosity = verbosity
|
||||
LogWriters = new List<ILogger> { logger },
|
||||
LogLevel = verbosity
|
||||
});
|
||||
|
||||
// act
|
||||
client.Log(testVerbosity, "Test");
|
||||
|
||||
// assert
|
||||
Assert.AreEqual(!string.IsNullOrEmpty(stringBuilder.ToString()), expected);
|
||||
Assert.AreEqual(!string.IsNullOrEmpty(logger.GetLogs()), expected);
|
||||
}
|
||||
|
||||
[TestCase]
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<packagereference Include="Microsoft.NET.Test.Sdk" Version="15.9.0-preview-20180807-05"></packagereference>
|
||||
<PackageReference Include="Moq" Version="4.9.0" />
|
||||
<packagereference Include="NUnit" Version="3.10.1"></packagereference>
|
||||
<packagereference Include="NUnit3TestAdapter" Version="3.10.0"></packagereference>
|
||||
<packagereference Include="Microsoft.NET.Test.Sdk" Version="16.10.0"></packagereference>
|
||||
<PackageReference Include="Moq" Version="4.16.1" />
|
||||
<packagereference Include="NUnit" Version="3.13.2"></packagereference>
|
||||
<packagereference Include="NUnit3TestAdapter" Version="3.17.0"></packagereference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
using CryptoExchange.Net.Objects;
|
||||
using NUnit.Framework;
|
||||
using System.Globalization;
|
||||
|
||||
namespace CryptoExchange.Net.UnitTests
|
||||
{
|
||||
[TestFixture()]
|
||||
public class ExchangeHelpersTests
|
||||
{
|
||||
[TestCase(0.1, 1, 0.4, 0.4)]
|
||||
[TestCase(0.1, 1, 0.1, 0.1)]
|
||||
[TestCase(0.1, 1, 1, 1)]
|
||||
[TestCase(0.1, 1, 0.99, 0.99)]
|
||||
[TestCase(0.1, 1, 0.09, 0.1)]
|
||||
[TestCase(0.1, 1, 1.01, 1)]
|
||||
public void ClampValueTests(decimal min, decimal max, decimal input, decimal expected)
|
||||
{
|
||||
var result = ExchangeHelpers.ClampValue(min, max, input);
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
[TestCase(0.1, 1, 0.1, RoundingType.Down, 0.4, 0.4)]
|
||||
[TestCase(0.1, 1, 0.1, RoundingType.Down, 0.1, 0.1)]
|
||||
[TestCase(0.1, 1, 0.1, RoundingType.Down, 1, 1)]
|
||||
[TestCase(0.1, 1, 0.1, RoundingType.Down, 0.99, 0.9)]
|
||||
[TestCase(0.1, 1, 0.1, RoundingType.Down, 0.09, 0.1)]
|
||||
[TestCase(0.1, 1, 0.1, RoundingType.Down, 1.01, 1)]
|
||||
[TestCase(0.1, 1, 0.01, RoundingType.Down, 0.532, 0.53)]
|
||||
[TestCase(0.1, 1, 0.0001, RoundingType.Down, 0.532, 0.532)]
|
||||
[TestCase(0.1, 1, 0.0001, RoundingType.Closest, 0.532, 0.532)]
|
||||
[TestCase(0.1, 1, 0.0001, RoundingType.Down, 0.5516592, 0.5516)]
|
||||
[TestCase(0.1, 1, 0.0001, RoundingType.Closest, 0.5516592, 0.5517)]
|
||||
public void AdjustValueStepTests(decimal min, decimal max, decimal? step, RoundingType roundingType, decimal input, decimal expected)
|
||||
{
|
||||
var result = ExchangeHelpers.AdjustValueStep(min, max, step, roundingType, input);
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
[TestCase(0.1, 1, 2, RoundingType.Closest, 0.4, 0.4)]
|
||||
[TestCase(0.1, 1, 2, RoundingType.Closest, 0.1, 0.1)]
|
||||
[TestCase(0.1, 1, 2, RoundingType.Closest, 1, 1)]
|
||||
[TestCase(0.1, 1, 2, RoundingType.Down, 0.555, 0.55)]
|
||||
[TestCase(0.1, 1, 2, RoundingType.Closest, 0.555, 0.56)]
|
||||
[TestCase(0, 100, 5, RoundingType.Closest, 23.125987, 23.126)]
|
||||
[TestCase(0, 100, 5, RoundingType.Down, 23.125987, 23.125)]
|
||||
[TestCase(0, 100, 8, RoundingType.Down, 0.145647985948, 0.14564798)]
|
||||
[TestCase(0, 100, 8, RoundingType.Closest, 0.145647985948, 0.14564799)]
|
||||
public void AdjustValuePrecisionTests(decimal min, decimal max, int? precision, RoundingType roundingType, decimal input, decimal expected)
|
||||
{
|
||||
var result = ExchangeHelpers.AdjustValuePrecision(min, max, precision, roundingType, input);
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
[TestCase(5, 0.1563158, 0.15631)]
|
||||
[TestCase(5, 12.1789258, 12.17892)]
|
||||
[TestCase(2, 12.1789258, 12.17)]
|
||||
[TestCase(8, 156146.1247, 156146.1247)]
|
||||
[TestCase(8, 50, 50)]
|
||||
public void RoundDownTests(int decimalPlaces, decimal input, decimal expected)
|
||||
{
|
||||
var result = ExchangeHelpers.RoundDown(input, decimalPlaces);
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
[TestCase(0.1234560000, "0.123456")]
|
||||
[TestCase(794.1230130600, "794.12301306")]
|
||||
public void NormalizeTests(decimal input, string expected)
|
||||
{
|
||||
var result = ExchangeHelpers.Normalize(input);
|
||||
Assert.AreEqual(expected, result.ToString(CultureInfo.InvariantCulture));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
using CryptoExchange.Net.Authentication;
|
||||
using CryptoExchange.Net.Logging;
|
||||
using CryptoExchange.Net.Objects;
|
||||
using CryptoExchange.Net.UnitTests.TestImplementations;
|
||||
using Newtonsoft.Json;
|
||||
@@ -10,6 +9,7 @@ using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using CryptoExchange.Net.Interfaces;
|
||||
using CryptoExchange.Net.RateLimiter;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace CryptoExchange.Net.UnitTests
|
||||
{
|
||||
@@ -175,7 +175,7 @@ namespace CryptoExchange.Net.UnitTests
|
||||
{
|
||||
RateLimiters = new List<IRateLimiter> { new RateLimiterAPIKey(1, TimeSpan.FromSeconds(1)) },
|
||||
RateLimitingBehaviour = RateLimitingBehaviour.Wait,
|
||||
LogVerbosity = LogVerbosity.Debug,
|
||||
LogLevel = LogLevel.Debug,
|
||||
ApiCredentials = new ApiCredentials("TestKey", "TestSecret")
|
||||
});
|
||||
client.SetResponse("{\"property\": 123}");
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
using System;
|
||||
using System.Threading;
|
||||
using CryptoExchange.Net.Logging;
|
||||
using CryptoExchange.Net.Objects;
|
||||
using CryptoExchange.Net.Sockets;
|
||||
using CryptoExchange.Net.UnitTests.TestImplementations;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using NUnit.Framework;
|
||||
|
||||
@@ -49,7 +49,7 @@ namespace CryptoExchange.Net.UnitTests
|
||||
public void SocketMessages_Should_BeProcessedInDataHandlers()
|
||||
{
|
||||
// arrange
|
||||
var client = new TestSocketClient(new SocketClientOptions("") { ReconnectInterval = TimeSpan.Zero, LogVerbosity = LogVerbosity.Debug });
|
||||
var client = new TestSocketClient(new SocketClientOptions("") { ReconnectInterval = TimeSpan.Zero, LogLevel = LogLevel.Debug });
|
||||
var socket = client.CreateSocket();
|
||||
socket.ShouldReconnect = true;
|
||||
socket.CanConnect = true;
|
||||
@@ -57,9 +57,9 @@ namespace CryptoExchange.Net.UnitTests
|
||||
var sub = new SocketConnection(client, socket);
|
||||
var rstEvent = new ManualResetEvent(false);
|
||||
JToken result = null;
|
||||
sub.AddHandler(SocketSubscription.CreateForIdentifier("TestHandler", true, (connection, data) =>
|
||||
sub.AddSubscription(SocketSubscription.CreateForIdentifier("TestHandler", true, (messageEvent) =>
|
||||
{
|
||||
result = data;
|
||||
result = messageEvent.JsonData;
|
||||
rstEvent.Set();
|
||||
}));
|
||||
client.ConnectSocketSub(sub);
|
||||
@@ -71,13 +71,41 @@ namespace CryptoExchange.Net.UnitTests
|
||||
// assert
|
||||
Assert.IsTrue((int)result["property"] == 123);
|
||||
}
|
||||
|
||||
|
||||
[TestCase(false)]
|
||||
[TestCase(true)]
|
||||
public void SocketMessages_Should_ContainOriginalDataIfEnabled(bool enabled)
|
||||
{
|
||||
// arrange
|
||||
var client = new TestSocketClient(new SocketClientOptions("") { ReconnectInterval = TimeSpan.Zero, LogLevel = LogLevel.Debug, OutputOriginalData = enabled });
|
||||
var socket = client.CreateSocket();
|
||||
socket.ShouldReconnect = true;
|
||||
socket.CanConnect = true;
|
||||
socket.DisconnectTime = DateTime.UtcNow;
|
||||
var sub = new SocketConnection(client, socket);
|
||||
var rstEvent = new ManualResetEvent(false);
|
||||
string original = null;
|
||||
sub.AddSubscription(SocketSubscription.CreateForIdentifier("TestHandler", true, (messageEvent) =>
|
||||
{
|
||||
original = messageEvent.OriginalData;
|
||||
rstEvent.Set();
|
||||
}));
|
||||
client.ConnectSocketSub(sub);
|
||||
|
||||
// act
|
||||
socket.InvokeMessage("{\"property\": 123}");
|
||||
rstEvent.WaitOne(1000);
|
||||
|
||||
// assert
|
||||
Assert.IsTrue(original == (enabled ? "{\"property\": 123}" : null));
|
||||
}
|
||||
|
||||
[TestCase]
|
||||
public void DisconnectedSocket_Should_Reconnect()
|
||||
{
|
||||
// arrange
|
||||
bool reconnected = false;
|
||||
var client = new TestSocketClient(new SocketClientOptions("") { ReconnectInterval = TimeSpan.Zero, LogVerbosity = LogVerbosity.Debug });
|
||||
var client = new TestSocketClient(new SocketClientOptions("") { ReconnectInterval = TimeSpan.Zero, LogLevel = LogLevel.Debug });
|
||||
var socket = client.CreateSocket();
|
||||
socket.ShouldReconnect = true;
|
||||
socket.CanConnect = true;
|
||||
@@ -104,15 +132,15 @@ namespace CryptoExchange.Net.UnitTests
|
||||
public void UnsubscribingStream_Should_CloseTheSocket()
|
||||
{
|
||||
// arrange
|
||||
var client = new TestSocketClient(new SocketClientOptions("") { ReconnectInterval = TimeSpan.Zero, LogVerbosity = LogVerbosity.Debug });
|
||||
var client = new TestSocketClient(new SocketClientOptions("") { ReconnectInterval = TimeSpan.Zero, LogLevel = LogLevel.Debug });
|
||||
var socket = client.CreateSocket();
|
||||
socket.CanConnect = true;
|
||||
var sub = new SocketConnection(client, socket);
|
||||
client.ConnectSocketSub(sub);
|
||||
var ups = new UpdateSubscription(sub, SocketSubscription.CreateForIdentifier("Test", true, (d, a) => {}));
|
||||
var ups = new UpdateSubscription(sub, SocketSubscription.CreateForIdentifier("Test", true, (e) => {}));
|
||||
|
||||
// act
|
||||
client.Unsubscribe(ups).Wait();
|
||||
client.UnsubscribeAsync(ups).Wait();
|
||||
|
||||
// assert
|
||||
Assert.IsTrue(socket.Connected == false);
|
||||
@@ -122,7 +150,7 @@ namespace CryptoExchange.Net.UnitTests
|
||||
public void UnsubscribingAll_Should_CloseAllSockets()
|
||||
{
|
||||
// arrange
|
||||
var client = new TestSocketClient(new SocketClientOptions("") { ReconnectInterval = TimeSpan.Zero, LogVerbosity = LogVerbosity.Debug });
|
||||
var client = new TestSocketClient(new SocketClientOptions("") { ReconnectInterval = TimeSpan.Zero, LogLevel = LogLevel.Debug });
|
||||
var socket1 = client.CreateSocket();
|
||||
var socket2 = client.CreateSocket();
|
||||
socket1.CanConnect = true;
|
||||
@@ -133,7 +161,7 @@ namespace CryptoExchange.Net.UnitTests
|
||||
client.ConnectSocketSub(sub2);
|
||||
|
||||
// act
|
||||
client.UnsubscribeAll().Wait();
|
||||
client.UnsubscribeAllAsync().Wait();
|
||||
|
||||
// assert
|
||||
Assert.IsTrue(socket1.Connected == false);
|
||||
@@ -144,7 +172,7 @@ namespace CryptoExchange.Net.UnitTests
|
||||
public void FailingToConnectSocket_Should_ReturnError()
|
||||
{
|
||||
// arrange
|
||||
var client = new TestSocketClient(new SocketClientOptions("") { ReconnectInterval = TimeSpan.Zero, LogVerbosity = LogVerbosity.Debug });
|
||||
var client = new TestSocketClient(new SocketClientOptions("") { ReconnectInterval = TimeSpan.Zero, LogLevel = LogLevel.Debug });
|
||||
var socket = client.CreateSocket();
|
||||
socket.CanConnect = false;
|
||||
var sub = new SocketConnection(client, socket);
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
using System;
|
||||
using System.Threading;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using CryptoExchange.Net.Logging;
|
||||
using CryptoExchange.Net.Interfaces;
|
||||
using CryptoExchange.Net.Objects;
|
||||
using CryptoExchange.Net.OrderBook;
|
||||
using CryptoExchange.Net.Sockets;
|
||||
using CryptoExchange.Net.UnitTests.TestImplementations;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace CryptoExchange.Net.UnitTests
|
||||
@@ -24,15 +22,32 @@ namespace CryptoExchange.Net.UnitTests
|
||||
|
||||
public override void Dispose() {}
|
||||
|
||||
protected override Task<CallResult<bool>> DoResync()
|
||||
protected override Task<CallResult<bool>> DoResyncAsync()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
protected override Task<CallResult<UpdateSubscription>> DoStart()
|
||||
protected override Task<CallResult<UpdateSubscription>> DoStartAsync()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void SetData(IEnumerable<ISymbolOrderBookEntry> bids, IEnumerable<ISymbolOrderBookEntry> asks)
|
||||
{
|
||||
Status = OrderBookStatus.Synced;
|
||||
base.bids.Clear();
|
||||
foreach (var bid in bids)
|
||||
base.bids.Add(bid.Price, bid);
|
||||
base.asks.Clear();
|
||||
foreach (var ask in asks)
|
||||
base.asks.Add(ask.Price, ask);
|
||||
}
|
||||
}
|
||||
|
||||
public class BookEntry : ISymbolOrderBookEntry
|
||||
{
|
||||
public decimal Quantity { get; set; }
|
||||
public decimal Price { get; set; }
|
||||
}
|
||||
|
||||
[TestCase]
|
||||
@@ -65,5 +80,33 @@ namespace CryptoExchange.Net.UnitTests
|
||||
Assert.AreEqual(0m, symbolOrderBook.BestOffers.Ask.Price);
|
||||
Assert.AreEqual(0m, symbolOrderBook.BestOffers.Ask.Quantity);
|
||||
}
|
||||
|
||||
[TestCase]
|
||||
public void CalculateAverageFillPrice()
|
||||
{
|
||||
var orderbook = new TestableSymbolOrderBook();
|
||||
orderbook.SetData(new List<ISymbolOrderBookEntry>
|
||||
{
|
||||
new BookEntry{ Price = 1, Quantity = 1 },
|
||||
new BookEntry{ Price = 1.1m, Quantity = 1 },
|
||||
},
|
||||
new List<ISymbolOrderBookEntry>()
|
||||
{
|
||||
new BookEntry{ Price = 1.2m, Quantity = 1 },
|
||||
new BookEntry{ Price = 1.3m, Quantity = 1 },
|
||||
});
|
||||
|
||||
var resultBids = orderbook.CalculateAverageFillPrice(2, OrderBookEntryType.Bid);
|
||||
var resultAsks = orderbook.CalculateAverageFillPrice(2, OrderBookEntryType.Ask);
|
||||
var resultBids2 = orderbook.CalculateAverageFillPrice(1.5m, OrderBookEntryType.Bid);
|
||||
var resultAsks2 = orderbook.CalculateAverageFillPrice(1.5m, OrderBookEntryType.Ask);
|
||||
|
||||
Assert.True(resultBids.Success);
|
||||
Assert.True(resultAsks.Success);
|
||||
Assert.AreEqual(1.05m, resultBids.Data);
|
||||
Assert.AreEqual(1.25m, resultAsks.Data);
|
||||
Assert.AreEqual(1.06666667m, resultBids2.Data);
|
||||
Assert.AreEqual(1.23333333m, resultAsks2.Data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Net.Http;
|
||||
using CryptoExchange.Net.Authentication;
|
||||
using CryptoExchange.Net.Logging;
|
||||
using CryptoExchange.Net.Objects;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace CryptoExchange.Net.UnitTests
|
||||
{
|
||||
@@ -17,7 +16,7 @@ namespace CryptoExchange.Net.UnitTests
|
||||
{
|
||||
}
|
||||
|
||||
public void Log(LogVerbosity verbosity, string data)
|
||||
public void Log(LogLevel verbosity, string data)
|
||||
{
|
||||
log.Write(verbosity, data);
|
||||
}
|
||||
|
||||
@@ -40,11 +40,11 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||
|
||||
var response = new Mock<IResponse>();
|
||||
response.Setup(c => c.IsSuccessStatusCode).Returns(true);
|
||||
response.Setup(c => c.GetResponseStream()).Returns(Task.FromResult((Stream)responseStream));
|
||||
response.Setup(c => c.GetResponseStreamAsync()).Returns(Task.FromResult((Stream)responseStream));
|
||||
|
||||
var request = new Mock<IRequest>();
|
||||
request.Setup(c => c.Uri).Returns(new Uri("http://www.test.com"));
|
||||
request.Setup(c => c.GetResponse(It.IsAny<CancellationToken>())).Returns(Task.FromResult(response.Object));
|
||||
request.Setup(c => c.GetResponseAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(response.Object));
|
||||
|
||||
var factory = Mock.Get(RequestFactory);
|
||||
factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<string>(), It.IsAny<int>()))
|
||||
@@ -57,7 +57,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||
typeof(HttpRequestException).GetField("_message", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance).SetValue(we, message);
|
||||
|
||||
var request = new Mock<IRequest>();
|
||||
request.Setup(c => c.GetResponse(It.IsAny<CancellationToken>())).Throws(we);
|
||||
request.Setup(c => c.GetResponseAsync(It.IsAny<CancellationToken>())).Throws(we);
|
||||
|
||||
var factory = Mock.Get(RequestFactory);
|
||||
factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<string>(), It.IsAny<int>()))
|
||||
@@ -73,11 +73,11 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||
|
||||
var response = new Mock<IResponse>();
|
||||
response.Setup(c => c.IsSuccessStatusCode).Returns(false);
|
||||
response.Setup(c => c.GetResponseStream()).Returns(Task.FromResult((Stream)responseStream));
|
||||
response.Setup(c => c.GetResponseStreamAsync()).Returns(Task.FromResult((Stream)responseStream));
|
||||
|
||||
var request = new Mock<IRequest>();
|
||||
request.Setup(c => c.Uri).Returns(new Uri("http://www.test.com"));
|
||||
request.Setup(c => c.GetResponse(It.IsAny<CancellationToken>())).Returns(Task.FromResult(response.Object));
|
||||
request.Setup(c => c.GetResponseAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(response.Object));
|
||||
|
||||
var factory = Mock.Get(RequestFactory);
|
||||
factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<string>(), It.IsAny<int>()))
|
||||
@@ -86,7 +86,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||
|
||||
public async Task<CallResult<T>> Request<T>(CancellationToken ct = default) where T:class
|
||||
{
|
||||
return await SendRequest<T>(new Uri("http://www.test.com"), HttpMethod.Get, ct);
|
||||
return await SendRequestAsync<T>(new Uri("http://www.test.com"), HttpMethod.Get, ct);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
using System;
|
||||
using System.Security.Authentication;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using CryptoExchange.Net.Interfaces;
|
||||
using WebSocket4Net;
|
||||
using CryptoExchange.Net.Objects;
|
||||
|
||||
namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||
{
|
||||
@@ -23,12 +24,12 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||
public Func<byte[], string> DataInterpreterBytes { get; set; }
|
||||
public DateTime? DisconnectTime { get; set; }
|
||||
public string Url { get; }
|
||||
public WebSocketState SocketState { get; }
|
||||
public bool IsClosed => !Connected;
|
||||
public bool IsOpen => Connected;
|
||||
public bool PingConnection { get; set; }
|
||||
public TimeSpan PingInterval { get; set; }
|
||||
public SslProtocols SSLProtocols { get; set; }
|
||||
public Encoding Encoding { get; set; }
|
||||
|
||||
public int ConnectCalls { get; private set; }
|
||||
public bool Reconnecting { get; set; }
|
||||
@@ -46,7 +47,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||
}
|
||||
}
|
||||
|
||||
public Task<bool> Connect()
|
||||
public Task<bool> ConnectAsync()
|
||||
{
|
||||
Connected = CanConnect;
|
||||
ConnectCalls++;
|
||||
@@ -65,7 +66,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||
{
|
||||
}
|
||||
|
||||
public Task Close()
|
||||
public Task CloseAsync()
|
||||
{
|
||||
Connected = false;
|
||||
DisconnectTime = DateTime.UtcNow;
|
||||
@@ -97,5 +98,10 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||
{
|
||||
OnMessage?.Invoke(data);
|
||||
}
|
||||
|
||||
public void SetProxy(ApiProxy proxy)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||
|
||||
public CallResult<bool> ConnectSocketSub(SocketConnection sub)
|
||||
{
|
||||
return ConnectSocket(sub).Result;
|
||||
return ConnectSocketAsync(sub).Result;
|
||||
}
|
||||
|
||||
protected internal override bool HandleQueryResponse<T>(SocketConnection s, object request, JToken data, out CallResult<T> callResult)
|
||||
@@ -53,12 +53,12 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||
return true;
|
||||
}
|
||||
|
||||
protected internal override Task<CallResult<bool>> AuthenticateSocket(SocketConnection s)
|
||||
protected internal override Task<CallResult<bool>> AuthenticateSocketAsync(SocketConnection s)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
protected internal override Task<bool> Unsubscribe(SocketConnection connection, SocketSubscription s)
|
||||
protected internal override Task<bool> UnsubscribeAsync(SocketConnection connection, SocketSubscription s)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
using Microsoft.Extensions.Logging;
|
||||
using System;
|
||||
using System.Text;
|
||||
|
||||
namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||
{
|
||||
public class TestStringLogger : ILogger
|
||||
{
|
||||
StringBuilder _builder = new StringBuilder();
|
||||
|
||||
public IDisposable BeginScope<TState>(TState state) => null;
|
||||
|
||||
public bool IsEnabled(LogLevel logLevel) => true;
|
||||
|
||||
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
|
||||
{
|
||||
_builder.AppendLine(formatter(state, exception));
|
||||
}
|
||||
|
||||
public string GetLogs()
|
||||
{
|
||||
return _builder.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user