wip

JKorf · Apr 12, 2024 · f793ca0 · f793ca0
1 parent cedc5f9
commit f793ca0
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 22 deletions.
diff --git a/ByBit.Net/Bybit.Net.csproj b/ByBit.Net/Bybit.Net.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <Nullable>enable</Nullable>
@@ -52,6 +52,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="CryptoExchange.Net" Version="7.2.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\CryptoExchange.Net\CryptoExchange.Net\CryptoExchange.Net.csproj" />
   </ItemGroup>
 </Project>
diff --git a/ByBit.Net/Clients/CopyTradingApi/BybitRestClientCopyTradingApi.cs b/ByBit.Net/Clients/CopyTradingApi/BybitRestClientCopyTradingApi.cs
@@ -78,7 +78,7 @@ internal async Task<WebCallResult<BybitResult<T>>> SendRequestWrapperAsync<T>(
              Dictionary<string, object>? parameters = null,
              bool signed = false) where T : class
         {
-            var result = await base.SendRequestAsync<BybitResult<T>>(uri, method, cancellationToken, parameters, signed).ConfigureAwait(false);
+            var result = await base.SendRequestAsync<BybitResult<T>>(uri, method, cancellationToken, parameters, signed, requestWeight: 0).ConfigureAwait(false);
             if (!result)
                 return result.As<BybitResult<T>>(default);
 
@@ -93,10 +93,9 @@ internal async Task<WebCallResult<IEnumerable<T>>> SendRequestListAsync<T>(
              HttpMethod method,
              CancellationToken cancellationToken,
              Dictionary<string, object>? parameters = null,
-             bool signed = false,
-             bool ignoreRatelimit = false)
+             bool signed = false)
         {
-            var result = await base.SendRequestAsync<BybitCopyTradingResult<BybitList<T>>>(uri, method, cancellationToken, parameters, signed, ignoreRatelimit: ignoreRatelimit).ConfigureAwait(false);
+            var result = await base.SendRequestAsync<BybitCopyTradingResult<BybitList<T>>>(uri, method, cancellationToken, parameters, signed, requestWeight: 0).ConfigureAwait(false);
             if (!result)
                 return result.As<IEnumerable<T>>(default);
 
@@ -111,10 +110,9 @@ internal async Task<WebCallResult<T>> SendRequestAsync<T>(
              HttpMethod method,
              CancellationToken cancellationToken,
              Dictionary<string, object>? parameters = null,
-             bool signed = false,
-             bool ignoreRatelimit = false)
+             bool signed = false)
         {
-            var result = await base.SendRequestAsync<BybitCopyTradingResult<T>>(uri, method, cancellationToken, parameters, signed, ignoreRatelimit: ignoreRatelimit).ConfigureAwait(false);
+            var result = await base.SendRequestAsync<BybitCopyTradingResult<T>>(uri, method, cancellationToken, parameters, signed, requestWeight: 0).ConfigureAwait(false);
             if (!result)
                 return result.As<T>(default);
 

diff --git a/ByBit.Net/Clients/DerivativesApi/BybitRestClientDerivativesApi.cs b/ByBit.Net/Clients/DerivativesApi/BybitRestClientDerivativesApi.cs
@@ -83,10 +83,9 @@ internal async Task<WebCallResult<BybitResult<T>>> SendRequestWrapperAsync<T>(
              HttpMethod method,
              CancellationToken cancellationToken,
              Dictionary<string, object>? parameters = null,
-             bool signed = false,
-             bool ignoreRatelimit = false) where T : class
+             bool signed = false) where T : class
         {
-            var result = await base.SendRequestAsync<BybitResult<T>>(uri, method, cancellationToken, parameters, signed, ignoreRatelimit: ignoreRatelimit).ConfigureAwait(false);
+            var result = await base.SendRequestAsync<BybitResult<T>>(uri, method, cancellationToken, parameters, signed, requestWeight: 0).ConfigureAwait(false);
             if (!result)
                 return result.As<BybitResult<T>>(default);
 
@@ -104,7 +103,7 @@ internal async Task<WebCallResult<IEnumerable<T>>> SendRequestListAsync<T>(
              bool signed = false,
              bool ignoreRatelimit = false)
         {
-            var result = await base.SendRequestAsync<BybitCopyTradingResult<BybitList<T>>>(uri, method, cancellationToken, parameters, signed, ignoreRatelimit: ignoreRatelimit).ConfigureAwait(false);
+            var result = await base.SendRequestAsync<BybitCopyTradingResult<BybitList<T>>>(uri, method, cancellationToken, parameters, signed, requestWeight: 0).ConfigureAwait(false);
             if (!result)
                 return result.As<IEnumerable<T>>(default);
 
@@ -122,7 +121,7 @@ internal async Task<WebCallResult<T>> SendRequestAsync<T>(
              bool signed = false,
              bool ignoreRatelimit = false)
         {
-            var result = await base.SendRequestAsync<BybitCopyTradingResult<T>>(uri, method, cancellationToken, parameters, signed, ignoreRatelimit: ignoreRatelimit).ConfigureAwait(false);
+            var result = await base.SendRequestAsync<BybitCopyTradingResult<T>>(uri, method, cancellationToken, parameters, signed, requestWeight: 0).ConfigureAwait(false);
             if (!result)
                 return result.As<T>(default);
 

diff --git a/ByBit.Net/Clients/DerivativesApi/BybitRestClientDerivativesApiExchangeData.cs b/ByBit.Net/Clients/DerivativesApi/BybitRestClientDerivativesApiExchangeData.cs
@@ -253,7 +253,7 @@ public async Task<WebCallResult<IEnumerable<BybitDerivativesRiskLimit>>> GetRisk
         /// <inheritdoc />
         public async Task<WebCallResult<DateTime>> GetServerTimeAsync(CancellationToken ct = default)
         {
-            var result = await _baseClient.SendRequestWrapperAsync<BybitDerivativesServerTime>(_baseClient.GetUrl("/v3/public/time"), HttpMethod.Get, ct, null, ignoreRatelimit: true).ConfigureAwait(false);
+            var result = await _baseClient.SendRequestWrapperAsync<BybitDerivativesServerTime>(_baseClient.GetUrl("/v3/public/time"), HttpMethod.Get, ct, null).ConfigureAwait(false);
             if (!result)
                 return result.As<DateTime>(default);
 

diff --git a/ByBit.Net/Clients/SpotApi/BybitRestClientBaseSpotApi.cs b/ByBit.Net/Clients/SpotApi/BybitRestClientBaseSpotApi.cs
@@ -77,7 +77,7 @@ internal async Task<WebCallResult<T>> SendRequestAsync<T>(
              bool signed = false,
              bool ignoreRatelimit = false)
         {
-            var result = await base.SendRequestAsync<BybitResult<T>>(uri, method, cancellationToken, parameters, signed, ignoreRatelimit: ignoreRatelimit).ConfigureAwait(false);
+            var result = await base.SendRequestAsync<BybitResult<T>>(uri, method, cancellationToken, parameters, signed, requestWeight: 0).ConfigureAwait(false);
             if (!result)
                 return result.As<T>(default);
 

diff --git a/ByBit.Net/Clients/V5/BybitRestClientApi.cs b/ByBit.Net/Clients/V5/BybitRestClientApi.cs
@@ -110,7 +110,7 @@ internal async Task<WebCallResult<BybitExtResult<T, U>>> SendRequestFullResponse
              Dictionary<string, object>? parameters = null,
              bool signed = false)
         {
-            return await base.SendRequestAsync<BybitExtResult<T, U>>(uri, method, cancellationToken, parameters, signed).ConfigureAwait(false);
+            return await base.SendRequestAsync<BybitExtResult<T, U>>(uri, method, cancellationToken, parameters, signed, requestWeight: 0).ConfigureAwait(false);
         }
 
         internal async Task<WebCallResult<T>> SendRequestAsync<T>(
@@ -120,7 +120,7 @@ internal async Task<WebCallResult<T>> SendRequestAsync<T>(
              Dictionary<string, object>? parameters = null,
              bool signed = false)
         {
-            var result = await base.SendRequestAsync<BybitResult<T>>(uri, method, cancellationToken, parameters, signed).ConfigureAwait(false);
+            var result = await base.SendRequestAsync<BybitResult<T>>(uri, method, cancellationToken, parameters, signed, requestWeight: 0).ConfigureAwait(false);
             if (!result)
                 return result.As<T>(default);
 
@@ -137,7 +137,7 @@ internal async Task<WebCallResult> SendRequestAsync(
              Dictionary<string, object>? parameters = null,
              bool signed = false)
         {
-            var result = await base.SendRequestAsync<BybitResult<object>>(uri, method, cancellationToken, parameters, signed).ConfigureAwait(false);
+            var result = await base.SendRequestAsync<BybitResult<object>>(uri, method, cancellationToken, parameters, signed, requestWeight: 0).ConfigureAwait(false);
             if (!result)
                 return result.AsDataless();
 

diff --git a/Bybit.UnitTests/JsonTests.cs b/Bybit.UnitTests/JsonTests.cs
@@ -15,11 +15,9 @@ public class JsonTests
         private JsonToObjectComparer<BybitRestClient> _comparer = new JsonToObjectComparer<BybitRestClient>((json) => TestHelpers.CreateResponseClient(json, x =>
         {
             x.ApiCredentials = new CryptoExchange.Net.Authentication.ApiCredentials("123", "123");
-            x.SpotOptions.RateLimiters = new List<IRateLimiter>();
+            x.RatelimiterEnabled = false;
             x.SpotOptions.OutputOriginalData = true;
-            x.DerivativesOptions.RateLimiters = new List<IRateLimiter>();
             x.DerivativesOptions.OutputOriginalData = true;
-            x.V5Options.RateLimiters = new List<IRateLimiter>();
             x.V5Options.OutputOriginalData = true;
         },
             System.Net.HttpStatusCode.OK));