Merge pull request #18 from jhonabreul/refactor-normalize-namespaces

Normalize namespace to match all other Lean brokerages
QuantConnect · Feb 29, 2024 · f2924a1 · f2924a1
2 parents 1bba7c5 + 546c7b4
commit f2924a1
Show file tree

Hide file tree

Showing 86 changed files with 162 additions and 180 deletions.
diff --git a/.github/workflows/gh-actions.yml b/.github/workflows/gh-actions.yml
@@ -47,4 +47,4 @@ jobs:
         run: dotnet build /p:Configuration=Release /v:quiet /p:WarningLevel=1 QuantConnect.BybitBrokerage.sln
 
       - name: Run Tests
-        run: dotnet test ./QuantConnect.BybitBrokerage.Tests/bin/Release/QuantConnect.BybitBrokerage.Tests.dll
+        run: dotnet test ./QuantConnect.BybitBrokerage.Tests/bin/Release/QuantConnect.Brokerages.Bybit.Tests.dll
diff --git a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageAdditionalTests.cs b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageAdditionalTests.cs
@@ -16,15 +16,14 @@
 using System;
 using Moq;
 using NUnit.Framework;
-using QuantConnect.Brokerages;
 using QuantConnect.Configuration;
 using QuantConnect.Util;
 using QuantConnect.Interfaces;
 using QuantConnect.Lean.Engine.DataFeeds;
 using QuantConnect.Securities;
 using QuantConnect.Tests.Common.Securities;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture, Explicit("Requires valid credentials to be setup and run outside USA")]
     public class BybitBrokerageAdditionalTests

diff --git a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageFactoryTests.cs b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageFactoryTests.cs
@@ -17,7 +17,7 @@
 using QuantConnect.Interfaces;
 using QuantConnect.Util;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture]
     public class BybitBrokerageFactoryTests

diff --git a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageHistoryProviderTests.cs b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageHistoryProviderTests.cs
@@ -16,7 +16,6 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
-using QuantConnect.Brokerages;
 using QuantConnect.Configuration;
 using QuantConnect.Data;
 using QuantConnect.Tests;
@@ -25,7 +24,7 @@
 using QuantConnect.Data.Market;
 using QuantConnect.Lean.Engine.DataFeeds;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture, Explicit("Requires valid credentials to be setup and run outside USA")]
     public class BybitBrokerageHistoryProviderTests

diff --git a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageTests.Stream.cs b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageTests.Stream.cs
@@ -21,7 +21,7 @@
 using QuantConnect.Data.Market;
 using QuantConnect.Interfaces;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture]
     public partial class BybitBrokerageTests

diff --git a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageTests.cs b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageTests.cs
@@ -18,9 +18,8 @@
 using System.Threading;
 using Moq;
 using NUnit.Framework;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Api;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Api;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Configuration;
 using QuantConnect.Interfaces;
 using QuantConnect.Lean.Engine.DataFeeds;
@@ -31,7 +30,7 @@
 using QuantConnect.Tests.Brokerages;
 using QuantConnect.Util;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture, Explicit("Requires valid credentials to be setup and run outside USA")]
     public partial class BybitBrokerageTests : BrokerageTests

diff --git a/QuantConnect.BybitBrokerage.Tests/BybitExchangeInfoDownloaderTests.cs b/QuantConnect.BybitBrokerage.Tests/BybitExchangeInfoDownloaderTests.cs
@@ -19,7 +19,7 @@
 using System;
 using System.Linq;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture, Explicit("Requires valid credentials to be setup and run outside USA")]
     public class BybitExchangeInfoDownloaderTests

diff --git a/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageHistoryProviderTests.cs b/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageHistoryProviderTests.cs
@@ -16,7 +16,7 @@
 using System;
 using NUnit.Framework;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture, Explicit("Requires valid credentials to be setup and run outside USA")]
     public class BybitFuturesBrokerageHistoryProviderTests : BybitBrokerageHistoryProviderTests

diff --git a/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageTests.Stream.cs b/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageTests.Stream.cs
@@ -15,7 +15,7 @@
 
 using NUnit.Framework;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture]
     public partial class BybitFuturesBrokerageTests

diff --git a/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageTests.cs b/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageTests.cs
@@ -14,11 +14,10 @@
 */
 
 using NUnit.Framework;
-using QuantConnect.BybitBrokerage.Models.Enums;
-using QuantConnect.Orders.Fees;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Tests.Brokerages;
 
-namespace QuantConnect.BybitBrokerage.Tests;
+namespace QuantConnect.Brokerages.Bybit.Tests;
 
 [TestFixture, Explicit("Requires valid credentials to be setup and run outside USA")]
 public partial class BybitFuturesBrokerageTests : BybitBrokerageTests

diff --git a/QuantConnect.BybitBrokerage.Tests/JsonConverters/JsonConverterTests.cs b/QuantConnect.BybitBrokerage.Tests/JsonConverters/JsonConverterTests.cs
@@ -17,10 +17,10 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using NUnit.Framework;
-using QuantConnect.BybitBrokerage.Converters;
-using QuantConnect.BybitBrokerage.Models;
+using QuantConnect.Brokerages.Bybit.Converters;
+using QuantConnect.Brokerages.Bybit.Models;
 
-namespace QuantConnect.BybitBrokerage.Tests.JsonConverters;
+namespace QuantConnect.Brokerages.Bybit.Tests.JsonConverters;
 
 public class JsonConverterTests
 {

diff --git a/QuantConnect.BybitBrokerage.Tests/QuantConnect.BybitBrokerage.Tests.csproj b/QuantConnect.BybitBrokerage.Tests/QuantConnect.BybitBrokerage.Tests.csproj
@@ -9,11 +9,12 @@
         <Copyright>Copyright ©  2021</Copyright>
         <TestProjectType>UnitTest</TestProjectType>
         <OutputPath>bin\$(Configuration)\</OutputPath>
-        <Product>QuantConnect.BybitBrokerage.Tests</Product>
-        <RootNamespace>QuantConnect.BybitBrokerage.Tests</RootNamespace>
-        <AssemblyTitle>QuantConnect.BybitBrokerage.Tests</AssemblyTitle>
+        <Product>QuantConnect.Brokerages.Bybit.Tests</Product>
+        <RootNamespace>QuantConnect.Brokerages.Bybit.Tests</RootNamespace>
+        <AssemblyTitle>QuantConnect.Brokerages.Bybit.Tests</AssemblyTitle>
+		<AssemblyName>QuantConnect.Brokerages.Bybit.Tests</AssemblyName>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <PackageId>QuantConnect.BybitBrokerage.Tests</PackageId>
+        <PackageId>QuantConnect.Brokerages.Bybit.Tests</PackageId>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/QuantConnect.BybitBrokerage.Tests/TestSetup.cs b/QuantConnect.BybitBrokerage.Tests/TestSetup.cs
@@ -20,7 +20,7 @@
 using QuantConnect.Logging;
 using QuantConnect.Configuration;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture]
     public class TestSetup

diff --git a/QuantConnect.BybitBrokerage.ToolBox/BybitBrokerageDownloader.cs b/QuantConnect.BybitBrokerage.ToolBox/BybitBrokerageDownloader.cs
@@ -17,15 +17,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using NodaTime;
-using QuantConnect.Brokerages;
 using QuantConnect.Configuration;
 using QuantConnect.Data;
 using QuantConnect.Data.Market;
 using QuantConnect.Logging;
 using QuantConnect.Securities;
 using QuantConnect.Util;
 
-namespace QuantConnect.BybitBrokerage.ToolBox
+namespace QuantConnect.Brokerages.Bybit.ToolBox
 {
     /// <summary>
     /// Template Brokerage Data Downloader implementation

diff --git a/QuantConnect.BybitBrokerage.ToolBox/BybitExchangeInfoDownloader.cs b/QuantConnect.BybitBrokerage.ToolBox/BybitExchangeInfoDownloader.cs
@@ -16,13 +16,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using QuantConnect.BybitBrokerage.Api;
-using QuantConnect.BybitBrokerage.Models;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Api;
+using QuantConnect.Brokerages.Bybit.Models;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Configuration;
 using QuantConnect.ToolBox;
 
-namespace QuantConnect.BybitBrokerage.ToolBox
+namespace QuantConnect.Brokerages.Bybit.ToolBox
 {
     /// <summary>
     /// Template Brokerage implementation of <see cref="IExchangeInfoDownloader"/>
@@ -75,7 +75,7 @@ private string GetInstrumentInfoString(BybitInstrumentInfo info, SecurityType se
         {
             var securityTypeStr = securityType.ToStringInvariant().ToLowerInvariant();
 
-            // Remove multiplier prefix from symbols like 10000LADYSUSDT. Not 1 as there is also 1INCHUSDT 
+            // Remove multiplier prefix from symbols like 10000LADYSUSDT. Not 1 as there is also 1INCHUSDT
             var symbolName = info.Symbol.StartsWith("10") ? info.Symbol.TrimStart('0', '1') : info.Symbol;
 
             // market,symbol,type,description,quote_currency,contract_multiplier,minimum_price_variation,lot_size,market_ticker,minimum_order_size,price_magnifier

diff --git a/QuantConnect.BybitBrokerage.ToolBox/Program.cs b/QuantConnect.BybitBrokerage.ToolBox/Program.cs
@@ -14,12 +14,11 @@
 */
 
 using System;
-using System.Collections.Generic;
 using QuantConnect.Configuration;
 using QuantConnect.ToolBox;
 using static QuantConnect.Configuration.ApplicationParser;
 
-namespace QuantConnect.BybitBrokerage.ToolBox
+namespace QuantConnect.Brokerages.Bybit.ToolBox
 {
     static class Program
     {

diff --git a/QuantConnect.BybitBrokerage.ToolBox/QuantConnect.BybitBrokerage.ToolBox.csproj b/QuantConnect.BybitBrokerage.ToolBox/QuantConnect.BybitBrokerage.ToolBox.csproj
@@ -7,15 +7,15 @@
         <TargetFramework>net6.0</TargetFramework>
         <Copyright>Copyright ©  2021</Copyright>
         <OutputPath>bin\$(Configuration)\</OutputPath>
-        <Product>QuantConnect.BybitBrokerage.ToolBox</Product>
-        <RootNamespace>QuantConnect.BybitBrokerage.ToolBox</RootNamespace>
-        <AssemblyTitle>QuantConnect.BybitBrokerage.ToolBox</AssemblyTitle>
-        <AssemblyName>QuantConnect.BybitBrokerage.ToolBox</AssemblyName>
+        <Product>QuantConnect.Brokerages.Bybit.ToolBox</Product>
+        <RootNamespace>QuantConnect.Brokerages.Bybit.ToolBox</RootNamespace>
+        <AssemblyTitle>QuantConnect.Brokerages.Bybit.ToolBox</AssemblyTitle>
+        <AssemblyName>QuantConnect.Brokerages.Bybit.ToolBox</AssemblyName>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <Description>QuantConnect LEAN Bybit Brokerage: Bybit Brokerage toolbox plugin for Lean</Description>
-        <PackageId>QuantConnect.BybitBrokerage.ToolBox</PackageId>
+        <PackageId>QuantConnect.Brokerages.Bybit.ToolBox</PackageId>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
         <DebugType>full</DebugType>

diff --git a/QuantConnect.BybitBrokerage/Api/BybitAccountApiEndpoint.cs b/QuantConnect.BybitBrokerage/Api/BybitAccountApiEndpoint.cs
@@ -14,12 +14,10 @@
 */
 
 using System.Collections.Generic;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Models;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models;
 using QuantConnect.Securities;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Bybit account api endpoint implementation

diff --git a/QuantConnect.BybitBrokerage/Api/BybitApi.cs b/QuantConnect.BybitBrokerage/Api/BybitApi.cs
@@ -15,11 +15,10 @@
 
 using System;
 using System.Collections.Generic;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Securities;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Provides methods to work with the Bybit rest API

diff --git a/QuantConnect.BybitBrokerage/Api/BybitApiClient.cs b/QuantConnect.BybitBrokerage/Api/BybitApiClient.cs
@@ -19,11 +19,10 @@
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using System.Web;
 using QuantConnect.Util;
 using RestSharp;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Bybit api client implementation

diff --git a/QuantConnect.BybitBrokerage/Api/BybitApiEndpoint.cs b/QuantConnect.BybitBrokerage/Api/BybitApiEndpoint.cs
@@ -21,15 +21,14 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Converters;
-using QuantConnect.BybitBrokerage.Models;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Converters;
+using QuantConnect.Brokerages.Bybit.Models;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Logging;
 using QuantConnect.Securities;
 using RestSharp;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Base Bybit api endpoint implementation

diff --git a/QuantConnect.BybitBrokerage/Api/BybitHistoryApi.cs b/QuantConnect.BybitBrokerage/Api/BybitHistoryApi.cs
@@ -18,13 +18,13 @@
 using System.Globalization;
 using System.IO;
 using System.IO.Compression;
-using QuantConnect.BybitBrokerage.Converters;
-using QuantConnect.BybitBrokerage.Models.Enums;
-using QuantConnect.BybitBrokerage.Models.Messages;
+using QuantConnect.Brokerages.Bybit.Converters;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Messages;
 using QuantConnect.Logging;
 using RestSharp;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Implements functionality to download historical tick data from Bybit

diff --git a/QuantConnect.BybitBrokerage/Api/BybitMarketApiEndpoint.cs b/QuantConnect.BybitBrokerage/Api/BybitMarketApiEndpoint.cs
@@ -16,12 +16,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Models;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Securities;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Bybit market api endpoint implementation

diff --git a/QuantConnect.BybitBrokerage/Api/BybitPositionApiEndpoint.cs b/QuantConnect.BybitBrokerage/Api/BybitPositionApiEndpoint.cs
@@ -15,12 +15,11 @@
 
 using System;
 using System.Collections.Generic;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Models;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Securities;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Bybit position api endpoint implementation

diff --git a/QuantConnect.BybitBrokerage/Api/BybitTradeApiEndpoint.cs b/QuantConnect.BybitBrokerage/Api/BybitTradeApiEndpoint.cs
@@ -16,16 +16,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Models;
-using QuantConnect.BybitBrokerage.Models.Enums;
-using QuantConnect.BybitBrokerage.Models.Requests;
+using QuantConnect.Brokerages.Bybit.Models;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Requests;
 using QuantConnect.Orders;
 using QuantConnect.Securities;
-using OrderType = QuantConnect.BybitBrokerage.Models.Enums.OrderType;
-using TimeInForce = QuantConnect.BybitBrokerage.Models.Enums.TimeInForce;
+using OrderType = QuantConnect.Brokerages.Bybit.Models.Enums.OrderType;
+using TimeInForce = QuantConnect.Brokerages.Bybit.Models.Enums.TimeInForce;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Bybit trade api endpoint implementation

diff --git a/QuantConnect.BybitBrokerage/BybitBrokerage.Brokerage.cs b/QuantConnect.BybitBrokerage/BybitBrokerage.Brokerage.cs
@@ -16,15 +16,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Orders;
 using QuantConnect.Orders.Fees;
 using QuantConnect.Securities;
 using OrderStatus = QuantConnect.Orders.OrderStatus;
-using OrderType = QuantConnect.BybitBrokerage.Models.Enums.OrderType;
+using OrderType = QuantConnect.Brokerages.Bybit.Models.Enums.OrderType;
 
-namespace QuantConnect.BybitBrokerage;
+namespace QuantConnect.Brokerages.Bybit;
 
 public partial class BybitBrokerage
 {