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

Normalize namespace to match all other Lean brokerages
QuantConnect · Feb 29, 2024 · c7a791c · c7a791c
2 parents 709fd03 + 08123c8
commit c7a791c
Show file tree

Hide file tree

Showing 28 changed files with 48 additions and 52 deletions.
diff --git a/.github/workflows/gh-actions.yml b/.github/workflows/gh-actions.yml
@@ -35,4 +35,4 @@ jobs:
         run: dotnet build /p:Configuration=Release /v:quiet /p:WarningLevel=1 QuantConnect.Wolverine.sln
 
       - name: Run Tests
-        run: dotnet test ./QuantConnect.Wolverine.Tests/bin/Release/QuantConnect.Wolverine.Tests.dll
+        run: dotnet test ./QuantConnect.Wolverine.Tests/bin/Release/QuantConnect.Brokerages.Wolverine.Tests.dll
diff --git a/QuantConnect.Wolverine.Tests/QuantConnect.Wolverine.Tests.csproj b/QuantConnect.Wolverine.Tests/QuantConnect.Wolverine.Tests.csproj
@@ -11,10 +11,10 @@
 		<Copyright>Copyright ©  2021</Copyright>
 		<TestProjectType>UnitTest</TestProjectType>
 		<OutputPath>bin\$(Configuration)\</OutputPath>
-		<Product>QuantConnect.Wolverine.Tests</Product>
-		<AssemblyName>QuantConnect.Wolverine.Tests</AssemblyName>
-		<RootNamespace>QuantConnect.Wolverine.Tests</RootNamespace>
-		<AssemblyTitle>QuantConnect.Wolverine.Tests</AssemblyTitle>
+		<Product>QuantConnect.Brokerages.Wolverine.Tests</Product>
+		<AssemblyName>QuantConnect.Brokerages.Wolverine.Tests</AssemblyName>
+		<RootNamespace>QuantConnect.Brokerages.Wolverine.Tests</RootNamespace>
+		<AssemblyTitle>QuantConnect.Brokerages.Wolverine.Tests</AssemblyTitle>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 	</PropertyGroup>
 

diff --git a/QuantConnect.Wolverine.Tests/TestSetup.cs b/QuantConnect.Wolverine.Tests/TestSetup.cs
@@ -15,7 +15,7 @@
 
 using QuantConnect.Tests;
 
-namespace QuantConnect.Wolverine.Tests
+namespace QuantConnect.Brokerages.Wolverine.Tests
 {
     [TestFixture]
     public class TestSetup

diff --git a/QuantConnect.Wolverine.Tests/Usings.cs b/QuantConnect.Wolverine.Tests/Usings.cs
@@ -3,11 +3,11 @@
 global using QuantConnect.Util;
 global using QuantConnect.Orders;
 global using QuantConnect.Packets;
-global using QuantConnect.Wolverine.Fix;
+global using QuantConnect.Brokerages.Wolverine.Fix;
 global using QuantConnect.Logging;
 global using QuantConnect.Algorithm;
 global using QuantConnect.Interfaces;
-global using QuantConnect.Wolverine.Fix.Core;
+global using QuantConnect.Brokerages.Wolverine.Fix.Core;
 global using QuantConnect.Configuration;
 global using QuantConnect.Tests.Brokerages;
 global using Log = QuantConnect.Logging.Log;

diff --git a/QuantConnect.Wolverine.Tests/WolverineBrokerageFactoryTests.cs b/QuantConnect.Wolverine.Tests/WolverineBrokerageFactoryTests.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.Wolverine.Tests
+namespace QuantConnect.Brokerages.Wolverine.Tests
 {
     public class WolverineBrokerageFactoryTests
     {

diff --git a/QuantConnect.Wolverine.Tests/WolverineBrokerageSymbolMapperTests.cs b/QuantConnect.Wolverine.Tests/WolverineBrokerageSymbolMapperTests.cs
@@ -15,7 +15,7 @@
 
 using QuantConnect.Tests;
 
-namespace QuantConnect.Wolverine.Tests
+namespace QuantConnect.Brokerages.Wolverine.Tests
 {
     [TestFixture]
     public class WolverineBrokerageSymbolMapperTests

diff --git a/QuantConnect.Wolverine.Tests/WolverineBrokerageTests.cs b/QuantConnect.Wolverine.Tests/WolverineBrokerageTests.cs
@@ -15,7 +15,7 @@
 
 using QuantConnect.Tests;
 
-namespace QuantConnect.Wolverine.Tests
+namespace QuantConnect.Brokerages.Wolverine.Tests
 {
     [TestFixture]
     [Explicit("These tests require a valid WEX configuration.")]

diff --git a/QuantConnect.Wolverine/Fix/Core/FixBrokerageController.cs b/QuantConnect.Wolverine/Fix/Core/FixBrokerageController.cs
@@ -14,12 +14,12 @@
 */
 
 using QuantConnect.Orders;
-using QuantConnect.Wolverine.Fix.Protocol;
+using QuantConnect.Brokerages.Wolverine.Fix.Protocol;
 using QuickFix.Fields;
 using QuickFix.FIX42;
 using System.Collections.Concurrent;
 
-namespace QuantConnect.Wolverine.Fix.Core
+namespace QuantConnect.Brokerages.Wolverine.Fix.Core
 {
     public class FixBrokerageController : IFixBrokerageController
     {

diff --git a/QuantConnect.Wolverine/Fix/Core/IFixBrokerageController.cs b/QuantConnect.Wolverine/Fix/Core/IFixBrokerageController.cs
@@ -14,10 +14,10 @@
 */
 
 using QuantConnect.Orders;
-using QuantConnect.Wolverine.Fix.Protocol;
+using QuantConnect.Brokerages.Wolverine.Fix.Protocol;
 using QuickFix.FIX42;
 
-namespace QuantConnect.Wolverine.Fix.Core
+namespace QuantConnect.Brokerages.Wolverine.Fix.Core
 {
     /// <summary>
     ///     Controls brokerage related communication between QC and a FIX protocol implementation.

diff --git a/QuantConnect.Wolverine/Fix/Core/ISession.cs b/QuantConnect.Wolverine/Fix/Core/ISession.cs
@@ -15,7 +15,7 @@
 
 using QuickFix;
 
-namespace QuantConnect.Wolverine.Fix.Core
+namespace QuantConnect.Brokerages.Wolverine.Fix.Core
 {
     public interface ISession
     {

diff --git a/QuantConnect.Wolverine/Fix/Core/QuickFixSession.cs b/QuantConnect.Wolverine/Fix/Core/QuickFixSession.cs
@@ -15,7 +15,7 @@
 
 using QuickFix;
 
-namespace QuantConnect.Wolverine.Fix.Core
+namespace QuantConnect.Brokerages.Wolverine.Fix.Core
 {
     public class QuickFixSession : ISession
     {

diff --git a/QuantConnect.Wolverine/Fix/FixConfiguration.cs b/QuantConnect.Wolverine/Fix/FixConfiguration.cs
@@ -16,7 +16,7 @@
 using QuickFix;
 using QuantConnect.Configuration;
 
-namespace QuantConnect.Wolverine.Fix
+namespace QuantConnect.Brokerages.Wolverine.Fix
 {
     public class FixConfiguration
     {

diff --git a/QuantConnect.Wolverine/Fix/FixError.cs b/QuantConnect.Wolverine/Fix/FixError.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.Wolverine.Fix
+namespace QuantConnect.Brokerages.Wolverine.Fix
 {
     /// <summary>
     /// Class is used to return error message from FIX protocol pipeline

diff --git a/QuantConnect.Wolverine/Fix/FixInstance.cs b/QuantConnect.Wolverine/Fix/FixInstance.cs
@@ -18,10 +18,10 @@
 using QuantConnect.Util;
 using QuickFix.Transport;
 using QuantConnect.Securities;
-using QuantConnect.Wolverine.Fix.Protocol;
-using QuantConnect.Wolverine.Fix.LogFactory;
+using QuantConnect.Brokerages.Wolverine.Fix.Protocol;
+using QuantConnect.Brokerages.Wolverine.Fix.LogFactory;
 
-namespace QuantConnect.Wolverine.Fix
+namespace QuantConnect.Brokerages.Wolverine.Fix
 {
     /// <summary>
     /// The instance of a single QuickFIX/n configuration

diff --git a/QuantConnect.Wolverine/Fix/LogFactory/QuickFixLogFactory.cs b/QuantConnect.Wolverine/Fix/LogFactory/QuickFixLogFactory.cs
@@ -16,7 +16,7 @@
 using QuickFix;
 using System.Collections.Concurrent;
 
-namespace QuantConnect.Wolverine.Fix.LogFactory
+namespace QuantConnect.Brokerages.Wolverine.Fix.LogFactory
 {
     public class QuickFixLogFactory : ILogFactory
     {

diff --git a/QuantConnect.Wolverine/Fix/LogFactory/QuickFixLogger.cs b/QuantConnect.Wolverine/Fix/LogFactory/QuickFixLogger.cs
@@ -15,7 +15,7 @@
 
 using QuickFix;
 
-namespace QuantConnect.Wolverine.Fix.LogFactory
+namespace QuantConnect.Brokerages.Wolverine.Fix.LogFactory
 {
     public class QuickFixLogger : ILog
     {

diff --git a/QuantConnect.Wolverine/Fix/Protocol/IFixOutboundBrokerageHandler.cs b/QuantConnect.Wolverine/Fix/Protocol/IFixOutboundBrokerageHandler.cs
@@ -15,7 +15,7 @@
 
 using QuantConnect.Orders;
 
-namespace QuantConnect.Wolverine.Fix.Protocol
+namespace QuantConnect.Brokerages.Wolverine.Fix.Protocol
 {
     public interface IFixOutboundBrokerageHandler
     {

diff --git a/QuantConnect.Wolverine/Fix/Protocol/IFixProtocolDirector.cs b/QuantConnect.Wolverine/Fix/Protocol/IFixProtocolDirector.cs
@@ -15,7 +15,7 @@
 
 using QuickFix;
 
-namespace QuantConnect.Wolverine.Fix.Protocol
+namespace QuantConnect.Brokerages.Wolverine.Fix.Protocol
 {
     /// <summary>
     ///     Applies protocol specific customizations, and helps direct FIX messages to specific handlers.

diff --git a/QuantConnect.Wolverine/Fix/Utils/MessageUtils.cs b/QuantConnect.Wolverine/Fix/Utils/MessageUtils.cs
@@ -17,7 +17,7 @@
 using System.Collections.Concurrent;
 using System.Reflection;
 
-namespace QuantConnect.Wolverine.Fix.Utils
+namespace QuantConnect.Brokerages.Wolverine.Fix.Utils
 {
     public static class MessageUtils
     {

diff --git a/QuantConnect.Wolverine/Fix/Utils/Utility.cs b/QuantConnect.Wolverine/Fix/Utils/Utility.cs
@@ -17,7 +17,7 @@
 using QuickFix.FIX42;
 using QF = QuickFix.Fields;
 
-namespace QuantConnect.Wolverine.Fix.Utils
+namespace QuantConnect.Brokerages.Wolverine.Fix.Utils
 {
     public static class Utility
     {

diff --git a/QuantConnect.Wolverine/IWolverineFixSessionHandler.cs b/QuantConnect.Wolverine/IWolverineFixSessionHandler.cs
@@ -15,7 +15,7 @@
 
 using QuickFix;
 
-namespace QuantConnect.Wolverine
+namespace QuantConnect.Brokerages.Wolverine
 {
     public interface IWolverineFixSessionHandler
     {

diff --git a/QuantConnect.Wolverine/QuantConnect.Wolverine.csproj b/QuantConnect.Wolverine/QuantConnect.Wolverine.csproj
@@ -5,10 +5,10 @@
 		<TargetFramework>net6.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<Product>QuantConnect.Wolverine</Product>
-		<AssemblyName>QuantConnect.Wolverine</AssemblyName>
-		<RootNamespace>QuantConnect.Wolverine</RootNamespace>
-		<AssemblyTitle>QuantConnect.Wolverine</AssemblyTitle>
+		<Product>QuantConnect.Brokerages.Wolverine</Product>
+		<AssemblyName>QuantConnect.Brokerages.Wolverine</AssemblyName>
+		<RootNamespace>QuantConnect.Brokerages.Wolverine</RootNamespace>
+		<AssemblyTitle>QuantConnect.Brokerages.Wolverine</AssemblyTitle>
 		<OutputType>Library</OutputType>
 		<OutputPath>bin\$(Configuration)\</OutputPath>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

diff --git a/QuantConnect.Wolverine/WolverineBrokerage.cs b/QuantConnect.Wolverine/WolverineBrokerage.cs
@@ -18,14 +18,12 @@
 using QuantConnect.Packets;
 using QuantConnect.Interfaces;
 using QuantConnect.Securities;
-using QuantConnect.Brokerages;
-using QuantConnect.Wolverine.Fix;
-using QuantConnect.Wolverine.Fix.Core;
+using QuantConnect.Brokerages.Wolverine.Fix;
+using QuantConnect.Brokerages.Wolverine.Fix.Core;
 using QuickFix.FIX42;
 using QuantConnect.Logging;
 using QuantConnect.Orders.Fees;
-using QuantConnect.Wolverine.Fix.Utils;
-using QuantConnect.Configuration;
+using QuantConnect.Brokerages.Wolverine.Fix.Utils;
 using QuantConnect.Api;
 using System.Net.NetworkInformation;
 using System.Net;
@@ -36,7 +34,7 @@
 using Newtonsoft.Json.Linq;
 using QuickFix.Fields;
 
-namespace QuantConnect.Wolverine
+namespace QuantConnect.Brokerages.Wolverine
 {
     [BrokerageFactory(typeof(WolverineBrokerageFactory))]
     public class WolverineBrokerage : Brokerage

diff --git a/QuantConnect.Wolverine/WolverineBrokerageFactory.cs b/QuantConnect.Wolverine/WolverineBrokerageFactory.cs
@@ -15,13 +15,12 @@
 
 using QuantConnect.Util;
 using QuantConnect.Packets;
-using QuantConnect.Brokerages;
 using QuantConnect.Interfaces;
 using QuantConnect.Securities;
 using QuantConnect.Configuration;
-using QuantConnect.Wolverine.Fix;
+using QuantConnect.Brokerages.Wolverine.Fix;
 
-namespace QuantConnect.Wolverine
+namespace QuantConnect.Brokerages.Wolverine
 {
     /// <summary>
     /// Provides a Wolverine Brokerage implementation of BrokerageFactory

diff --git a/QuantConnect.Wolverine/WolverineFixProtocolDirector.cs b/QuantConnect.Wolverine/WolverineFixProtocolDirector.cs
@@ -14,15 +14,15 @@
 */
 
 using QuantConnect.Securities;
-using QuantConnect.Wolverine.Fix.Core;
-using QuantConnect.Wolverine.Fix.Protocol;
+using QuantConnect.Brokerages.Wolverine.Fix.Core;
+using QuantConnect.Brokerages.Wolverine.Fix.Protocol;
 using QuickFix;
 using QuickFix.Fields;
 using QuickFix.FIX42;
 using System.Collections.Concurrent;
 using Message = QuickFix.Message;
 
-namespace QuantConnect.Wolverine
+namespace QuantConnect.Brokerages.Wolverine
 {
     public class WolverineFixProtocolDirector : IFixProtocolDirector
     {

diff --git a/QuantConnect.Wolverine/WolverineOrderId.cs b/QuantConnect.Wolverine/WolverineOrderId.cs
@@ -15,7 +15,7 @@
 
 using System.Globalization;
 
-namespace QuantConnect.Wolverine
+namespace QuantConnect.Brokerages.Wolverine
 {
     public static class WolverineOrderId
     {

diff --git a/QuantConnect.Wolverine/WolverineOrderRoutingSessionHandler.cs b/QuantConnect.Wolverine/WolverineOrderRoutingSessionHandler.cs
@@ -17,14 +17,14 @@
 using QuantConnect.Securities;
 using QuantConnect.Securities.Equity;
 using QuantConnect.Util;
-using QuantConnect.Wolverine.Fix.Core;
-using QuantConnect.Wolverine.Fix.Protocol;
-using QuantConnect.Wolverine.Fix.Utils;
+using QuantConnect.Brokerages.Wolverine.Fix.Core;
+using QuantConnect.Brokerages.Wolverine.Fix.Protocol;
+using QuantConnect.Brokerages.Wolverine.Fix.Utils;
 using QuickFix;
 using QuickFix.Fields;
 using QuickFix.FIX42;
 
-namespace QuantConnect.Wolverine
+namespace QuantConnect.Brokerages.Wolverine
 {
     public class WolverineOrderRoutingSessionHandler : MessageCracker, IWolverineFixSessionHandler, IFixOutboundBrokerageHandler
     {

diff --git a/QuantConnect.Wolverine/WolverineSymbolMapper.cs b/QuantConnect.Wolverine/WolverineSymbolMapper.cs
@@ -13,11 +13,10 @@
  * limitations under the License.
 */
 
-using QuantConnect.Brokerages;
 using QuantConnect.Interfaces;
 using QuantConnect.Data.Auxiliary;
 
-namespace QuantConnect.Wolverine
+namespace QuantConnect.Brokerages.Wolverine
 {
     public class WolverineSymbolMapper : ISymbolMapper
     {