diff --git a/Spark.Api.Server.sln b/Spark.Api.Server.sln index c93b26825..3b3e9b5a6 100644 --- a/Spark.Api.Server.sln +++ b/Spark.Api.Server.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.3.32922.545 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bts.Spark.Api", "src\cs\Bts.Spark.Api\Bts.Spark.Api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bts.Spark.Core", "src\cs\Bts.Spark.Core\Bts.Spark.Core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}" EndProject diff --git a/spark_client.sln b/spark_client.sln index 9db4f1d9e..57d26c80b 100644 --- a/spark_client.sln +++ b/spark_client.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.3.32922.545 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bts.Spark.Api", "src\cs\Bts.Spark.Api\Bts.Spark.Api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark", "src\client\spark\Spark.csproj", "{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}" EndProject diff --git a/src/DataStreamSuite/DataStreamQueryAnalyzer.sln b/src/DataStreamSuite/DataStreamQueryAnalyzer.sln index cacd02a78..af308dc53 100644 --- a/src/DataStreamSuite/DataStreamQueryAnalyzer.sln +++ b/src/DataStreamSuite/DataStreamQueryAnalyzer.sln @@ -18,7 +18,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooleanExpressions", "Boole EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Core", "..\client\Bts.Spark.Core\Bts.Spark.Core.csproj", "{88E70136-91AE-4F56-B243-8F4642B46D6A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spark_api", "..\client\spark_api\spark_api.csproj", "{52DD33DB-00F5-44BF-AE0F-5FC58FB2277E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Api", "..\cs\Bts.Spark.Api\Bts.Spark.Api.csproj", "{52DD33DB-00F5-44BF-AE0F-5FC58FB2277E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlueRegistry", "BlueRegistry\BlueRegistry.csproj", "{0FD1BE7A-AEC8-4575-BA58-20E0F45E5214}" EndProject diff --git a/src/DataStreamSuite/DataStreamSuite.sln b/src/DataStreamSuite/DataStreamSuite.sln index 4409393c8..48b461cb9 100644 --- a/src/DataStreamSuite/DataStreamSuite.sln +++ b/src/DataStreamSuite/DataStreamSuite.sln @@ -17,7 +17,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooleanExpressions", "Boole EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Core", "..\cs\Bts.Spark.Core\Bts.Spark.Core.csproj", "{88E70136-91AE-4F56-B243-8F4642B46D6A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spark_api", "..\client\spark_api\spark_api.csproj", "{52DD33DB-00F5-44BF-AE0F-5FC58FB2277E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Api", "..\cs\Bts.Spark.Api\Bts.Spark.Api.csproj", "{52DD33DB-00F5-44BF-AE0F-5FC58FB2277E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseUtilities", "BaseUtilities\BaseUtilities.csproj", "{A9EDEEBD-A03A-4281-8FAF-2419D3E7009C}" EndProject diff --git a/src/DataStreamSuite/DataStreamTests/DataStreamTests.csproj b/src/DataStreamSuite/DataStreamTests/DataStreamTests.csproj index 02118cc95..38e00d2c7 100644 --- a/src/DataStreamSuite/DataStreamTests/DataStreamTests.csproj +++ b/src/DataStreamSuite/DataStreamTests/DataStreamTests.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/DataStreamSuite/SharedStreams/SharedStreams.csproj b/src/DataStreamSuite/SharedStreams/SharedStreams.csproj index d05e89016..35b10e654 100644 --- a/src/DataStreamSuite/SharedStreams/SharedStreams.csproj +++ b/src/DataStreamSuite/SharedStreams/SharedStreams.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/client/Spark.Console/Spark.Console.csproj b/src/client/Spark.Console/Spark.Console.csproj index 2ace80faf..6b017cb6a 100644 --- a/src/client/Spark.Console/Spark.Console.csproj +++ b/src/client/Spark.Console/Spark.Console.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml index dbb5ebe0f..294ad462d 100644 --- a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml +++ b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml @@ -1,6 +1,6 @@  diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml b/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml index e60a7f9ea..0a5bc7f22 100644 --- a/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml +++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml @@ -7,7 +7,7 @@ xmlns:c="clr-namespace:mbts.ui.controls" xmlns:cv="clr-namespace:mbts.ui.converters" xmlns:usp="clr-namespace:mbts.ui.spark" - xmlns:api="clr-namespace:bts.api;assembly=spark_api"> + xmlns:api="clr-namespace:bts.api;assembly=Bts.Spark.Api"> diff --git a/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersView.xaml b/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersView.xaml index a091b15d0..c36bb0a23 100644 --- a/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersView.xaml +++ b/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersView.xaml @@ -3,7 +3,7 @@ x:ClassModifier="internal" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:api="clr-namespace:bts.api;assembly=spark_api" + xmlns:api="clr-namespace:bts.api;assembly=Bts.Spark.Api" xmlns:bv="clr-namespace:bts.view" xmlns:u="clr-namespace:mbts.ui" xmlns:c="clr-namespace:mbts.ui.controls" diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index 045537349..1307b48d6 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -12,7 +12,7 @@ xmlns:usp="clr-namespace:mbts.ui.spark" xmlns:uspcv="clr-namespace:mbts.ui.spark.converters" xmlns:sys="clr-namespace:System;assembly=mscorlib" - xmlns:order="clr-namespace:bts.api.orderman;assembly=spark_api" + xmlns:order="clr-namespace:bts.api.orderman;assembly=Bts.Spark.Api" mc:Ignorable="d" MaxHeight="240" d:DesignHeight="600" d:DesignWidth="1080" diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml index cefc44cf1..caff727ff 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml @@ -4,7 +4,7 @@ x:Name="Root" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:api="clr-namespace:bts.api;assembly=spark_api" + xmlns:api="clr-namespace:bts.api;assembly=Bts.Spark.Api" xmlns:sp="clr-namespace:mbts.spark" xmlns:u="clr-namespace:mbts.ui" xmlns:c="clr-namespace:mbts.ui.controls" diff --git a/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportView.xaml b/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportView.xaml index 306db7640..bd8c98a4a 100644 --- a/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportView.xaml +++ b/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportView.xaml @@ -3,7 +3,7 @@ x:ClassModifier="internal" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:api_trading="clr-namespace:Spark.Trading;assembly=spark_api" + xmlns:api_trading="clr-namespace:Spark.Trading;assembly=Bts.Spark.Api" xmlns:bv="clr-namespace:bts.view" xmlns:u="clr-namespace:mbts.ui" xmlns:c="clr-namespace:mbts.ui.controls" diff --git a/src/client/spark/Orders/OrderTicket.xaml b/src/client/spark/Orders/OrderTicket.xaml index 65c34b7a6..5e7918c75 100644 --- a/src/client/spark/Orders/OrderTicket.xaml +++ b/src/client/spark/Orders/OrderTicket.xaml @@ -2,7 +2,7 @@ x:Class="mbts.ui.spark.OrderTicket" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:msys="clr-namespace:bts.api;assembly=spark_api" + xmlns:msys="clr-namespace:bts.api;assembly=Bts.Spark.Api" xmlns:u="clr-namespace:mbts.ui" xmlns:cv="clr-namespace:mbts.ui.converters" xmlns:usp="clr-namespace:mbts.ui.spark" diff --git a/src/client/spark/Spark.csproj b/src/client/spark/Spark.csproj index 05f9f4e49..cb3046202 100644 --- a/src/client/spark/Spark.csproj +++ b/src/client/spark/Spark.csproj @@ -52,7 +52,7 @@ - + diff --git a/src/client/spark/view/Controls/Order/OrderTicketResources.xaml b/src/client/spark/view/Controls/Order/OrderTicketResources.xaml index d30a8dd7b..79ebaa523 100644 --- a/src/client/spark/view/Controls/Order/OrderTicketResources.xaml +++ b/src/client/spark/view/Controls/Order/OrderTicketResources.xaml @@ -3,7 +3,7 @@ x:ClassModifier="internal" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:msys="clr-namespace:bts.api;assembly=spark_api" + xmlns:msys="clr-namespace:bts.api;assembly=Bts.Spark.Api" xmlns:sp="clr-namespace:mbts.spark" xmlns:u="clr-namespace:mbts.ui" xmlns:cv="clr-namespace:mbts.ui.converters" diff --git a/src/client/spark/view/Controls/Order/QuantityMeasureControl.xaml b/src/client/spark/view/Controls/Order/QuantityMeasureControl.xaml index f4038af95..770509c79 100644 --- a/src/client/spark/view/Controls/Order/QuantityMeasureControl.xaml +++ b/src/client/spark/view/Controls/Order/QuantityMeasureControl.xaml @@ -1,7 +1,7 @@  diff --git a/src/client/spark_sdk/spark_sdk.csproj b/src/client/spark_sdk/spark_sdk.csproj index db70d3dd6..4067a1eae 100644 --- a/src/client/spark_sdk/spark_sdk.csproj +++ b/src/client/spark_sdk/spark_sdk.csproj @@ -32,7 +32,7 @@ - + @@ -50,7 +50,7 @@ - ..\..\lib\net8.0\spark_api.dll + ..\..\lib\net8.0\Bts.Spark.Api.dll diff --git a/src/client/spark_test/spark_test.csproj b/src/client/spark_test/spark_test.csproj index 23d4b1758..38e016f9a 100644 --- a/src/client/spark_test/spark_test.csproj +++ b/src/client/spark_test/spark_test.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/client/spark_websocket/spark_websocket.csproj b/src/client/spark_websocket/spark_websocket.csproj index 3d2dbb2c1..d06a24b6b 100644 --- a/src/client/spark_websocket/spark_websocket.csproj +++ b/src/client/spark_websocket/spark_websocket.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/client/spark_api/Admin/AdminClient.cs b/src/cs/Bts.Spark.Api/Admin/AdminClient.cs similarity index 100% rename from src/client/spark_api/Admin/AdminClient.cs rename to src/cs/Bts.Spark.Api/Admin/AdminClient.cs diff --git a/src/client/spark_api/Admin/EmptyAdminClient.cs b/src/cs/Bts.Spark.Api/Admin/EmptyAdminClient.cs similarity index 100% rename from src/client/spark_api/Admin/EmptyAdminClient.cs rename to src/cs/Bts.Spark.Api/Admin/EmptyAdminClient.cs diff --git a/src/client/spark_api/Admin/IAdminClient.cs b/src/cs/Bts.Spark.Api/Admin/IAdminClient.cs similarity index 100% rename from src/client/spark_api/Admin/IAdminClient.cs rename to src/cs/Bts.Spark.Api/Admin/IAdminClient.cs diff --git a/src/client/spark_api/Analytics/GreeksTuple.cs b/src/cs/Bts.Spark.Api/Analytics/GreeksTuple.cs similarity index 100% rename from src/client/spark_api/Analytics/GreeksTuple.cs rename to src/cs/Bts.Spark.Api/Analytics/GreeksTuple.cs diff --git a/src/client/spark_api/spark_api.csproj b/src/cs/Bts.Spark.Api/Bts.Spark.Api.csproj similarity index 98% rename from src/client/spark_api/spark_api.csproj rename to src/cs/Bts.Spark.Api/Bts.Spark.Api.csproj index 170348e04..3cd73ab9b 100644 --- a/src/client/spark_api/spark_api.csproj +++ b/src/cs/Bts.Spark.Api/Bts.Spark.Api.csproj @@ -1,7 +1,6 @@ net8.0 - Spark_API true x64 x64 @@ -21,7 +20,7 @@ - + diff --git a/src/client/spark_api/Domain/SecurityMetadataExtensions.cs b/src/cs/Bts.Spark.Api/Domain/SecurityMetadataExtensions.cs similarity index 100% rename from src/client/spark_api/Domain/SecurityMetadataExtensions.cs rename to src/cs/Bts.Spark.Api/Domain/SecurityMetadataExtensions.cs diff --git a/src/client/spark_api/IJsonFormatter.cs b/src/cs/Bts.Spark.Api/IJsonFormatter.cs similarity index 100% rename from src/client/spark_api/IJsonFormatter.cs rename to src/cs/Bts.Spark.Api/IJsonFormatter.cs diff --git a/src/client/spark_api/ISecurityKeyedData.cs b/src/cs/Bts.Spark.Api/ISecurityKeyedData.cs similarity index 100% rename from src/client/spark_api/ISecurityKeyedData.cs rename to src/cs/Bts.Spark.Api/ISecurityKeyedData.cs diff --git a/src/client/spark_api/IServiceProvider.cs b/src/cs/Bts.Spark.Api/IServiceProvider.cs similarity index 100% rename from src/client/spark_api/IServiceProvider.cs rename to src/cs/Bts.Spark.Api/IServiceProvider.cs diff --git a/src/client/spark_api/MarketData/AtomicPriceSize.cs b/src/cs/Bts.Spark.Api/MarketData/AtomicPriceSize.cs similarity index 100% rename from src/client/spark_api/MarketData/AtomicPriceSize.cs rename to src/cs/Bts.Spark.Api/MarketData/AtomicPriceSize.cs diff --git a/src/client/spark_api/MarketData/Bbo.cs b/src/cs/Bts.Spark.Api/MarketData/Bbo.cs similarity index 100% rename from src/client/spark_api/MarketData/Bbo.cs rename to src/cs/Bts.Spark.Api/MarketData/Bbo.cs diff --git a/src/client/spark_api/MarketData/Book.cs b/src/cs/Bts.Spark.Api/MarketData/Book.cs similarity index 100% rename from src/client/spark_api/MarketData/Book.cs rename to src/cs/Bts.Spark.Api/MarketData/Book.cs diff --git a/src/client/spark_api/MarketData/BookStore.cs b/src/cs/Bts.Spark.Api/MarketData/BookStore.cs similarity index 100% rename from src/client/spark_api/MarketData/BookStore.cs rename to src/cs/Bts.Spark.Api/MarketData/BookStore.cs diff --git a/src/client/spark_api/MarketData/BookTuple.cs b/src/cs/Bts.Spark.Api/MarketData/BookTuple.cs similarity index 100% rename from src/client/spark_api/MarketData/BookTuple.cs rename to src/cs/Bts.Spark.Api/MarketData/BookTuple.cs diff --git a/src/client/spark_api/MarketData/CallPutTuple.cs b/src/cs/Bts.Spark.Api/MarketData/CallPutTuple.cs similarity index 100% rename from src/client/spark_api/MarketData/CallPutTuple.cs rename to src/cs/Bts.Spark.Api/MarketData/CallPutTuple.cs diff --git a/src/client/spark_api/MarketData/Co2NativeMethods.cs b/src/cs/Bts.Spark.Api/MarketData/Co2NativeMethods.cs similarity index 100% rename from src/client/spark_api/MarketData/Co2NativeMethods.cs rename to src/cs/Bts.Spark.Api/MarketData/Co2NativeMethods.cs diff --git a/src/client/spark_api/MarketData/Co2NativeTestMethods.cs b/src/cs/Bts.Spark.Api/MarketData/Co2NativeTestMethods.cs similarity index 100% rename from src/client/spark_api/MarketData/Co2NativeTestMethods.cs rename to src/cs/Bts.Spark.Api/MarketData/Co2NativeTestMethods.cs diff --git a/src/client/spark_api/MarketData/Co2RelayControl.cs b/src/cs/Bts.Spark.Api/MarketData/Co2RelayControl.cs similarity index 100% rename from src/client/spark_api/MarketData/Co2RelayControl.cs rename to src/cs/Bts.Spark.Api/MarketData/Co2RelayControl.cs diff --git a/src/client/spark_api/MarketData/FakeMDConsumerHandle.cs b/src/cs/Bts.Spark.Api/MarketData/FakeMDConsumerHandle.cs similarity index 100% rename from src/client/spark_api/MarketData/FakeMDConsumerHandle.cs rename to src/cs/Bts.Spark.Api/MarketData/FakeMDConsumerHandle.cs diff --git a/src/client/spark_api/MarketData/IMDConsumerHandle.cs b/src/cs/Bts.Spark.Api/MarketData/IMDConsumerHandle.cs similarity index 100% rename from src/client/spark_api/MarketData/IMDConsumerHandle.cs rename to src/cs/Bts.Spark.Api/MarketData/IMDConsumerHandle.cs diff --git a/src/client/spark_api/MarketData/IMarketDataClient.cs b/src/cs/Bts.Spark.Api/MarketData/IMarketDataClient.cs similarity index 100% rename from src/client/spark_api/MarketData/IMarketDataClient.cs rename to src/cs/Bts.Spark.Api/MarketData/IMarketDataClient.cs diff --git a/src/client/spark_api/MarketData/ISecurityResolver.cs b/src/cs/Bts.Spark.Api/MarketData/ISecurityResolver.cs similarity index 100% rename from src/client/spark_api/MarketData/ISecurityResolver.cs rename to src/cs/Bts.Spark.Api/MarketData/ISecurityResolver.cs diff --git a/src/client/spark_api/MarketData/ImpliedPriceLevel.cs b/src/cs/Bts.Spark.Api/MarketData/ImpliedPriceLevel.cs similarity index 100% rename from src/client/spark_api/MarketData/ImpliedPriceLevel.cs rename to src/cs/Bts.Spark.Api/MarketData/ImpliedPriceLevel.cs diff --git a/src/client/spark_api/MarketData/IntPrice.cs b/src/cs/Bts.Spark.Api/MarketData/IntPrice.cs similarity index 100% rename from src/client/spark_api/MarketData/IntPrice.cs rename to src/cs/Bts.Spark.Api/MarketData/IntPrice.cs diff --git a/src/client/spark_api/MarketData/MDConsumer.cs b/src/cs/Bts.Spark.Api/MarketData/MDConsumer.cs similarity index 100% rename from src/client/spark_api/MarketData/MDConsumer.cs rename to src/cs/Bts.Spark.Api/MarketData/MDConsumer.cs diff --git a/src/client/spark_api/MarketData/MDConsumerChannel.cs b/src/cs/Bts.Spark.Api/MarketData/MDConsumerChannel.cs similarity index 100% rename from src/client/spark_api/MarketData/MDConsumerChannel.cs rename to src/cs/Bts.Spark.Api/MarketData/MDConsumerChannel.cs diff --git a/src/client/spark_api/MarketData/MDConsumerHandle.cs b/src/cs/Bts.Spark.Api/MarketData/MDConsumerHandle.cs similarity index 100% rename from src/client/spark_api/MarketData/MDConsumerHandle.cs rename to src/cs/Bts.Spark.Api/MarketData/MDConsumerHandle.cs diff --git a/src/client/spark_api/MarketData/MDSource.cs b/src/cs/Bts.Spark.Api/MarketData/MDSource.cs similarity index 100% rename from src/client/spark_api/MarketData/MDSource.cs rename to src/cs/Bts.Spark.Api/MarketData/MDSource.cs diff --git a/src/client/spark_api/MarketData/MDSourceOptions.cs b/src/cs/Bts.Spark.Api/MarketData/MDSourceOptions.cs similarity index 100% rename from src/client/spark_api/MarketData/MDSourceOptions.cs rename to src/cs/Bts.Spark.Api/MarketData/MDSourceOptions.cs diff --git a/src/client/spark_api/MarketData/MarketDataClient.cs b/src/cs/Bts.Spark.Api/MarketData/MarketDataClient.cs similarity index 100% rename from src/client/spark_api/MarketData/MarketDataClient.cs rename to src/cs/Bts.Spark.Api/MarketData/MarketDataClient.cs diff --git a/src/client/spark_api/MarketData/MarketDataClientConfig.cs b/src/cs/Bts.Spark.Api/MarketData/MarketDataClientConfig.cs similarity index 100% rename from src/client/spark_api/MarketData/MarketDataClientConfig.cs rename to src/cs/Bts.Spark.Api/MarketData/MarketDataClientConfig.cs diff --git a/src/client/spark_api/MarketData/MarketDataConsumerHandleExtensions.cs b/src/cs/Bts.Spark.Api/MarketData/MarketDataConsumerHandleExtensions.cs similarity index 100% rename from src/client/spark_api/MarketData/MarketDataConsumerHandleExtensions.cs rename to src/cs/Bts.Spark.Api/MarketData/MarketDataConsumerHandleExtensions.cs diff --git a/src/client/spark_api/MarketData/MarketDataExtensions.cs b/src/cs/Bts.Spark.Api/MarketData/MarketDataExtensions.cs similarity index 100% rename from src/client/spark_api/MarketData/MarketDataExtensions.cs rename to src/cs/Bts.Spark.Api/MarketData/MarketDataExtensions.cs diff --git a/src/client/spark_api/MarketData/NativePriceHelpers.cs b/src/cs/Bts.Spark.Api/MarketData/NativePriceHelpers.cs similarity index 100% rename from src/client/spark_api/MarketData/NativePriceHelpers.cs rename to src/cs/Bts.Spark.Api/MarketData/NativePriceHelpers.cs diff --git a/src/client/spark_api/MarketData/NativePriceLevel.cs b/src/cs/Bts.Spark.Api/MarketData/NativePriceLevel.cs similarity index 100% rename from src/client/spark_api/MarketData/NativePriceLevel.cs rename to src/cs/Bts.Spark.Api/MarketData/NativePriceLevel.cs diff --git a/src/client/spark_api/MarketData/NativePriceSize.cs b/src/cs/Bts.Spark.Api/MarketData/NativePriceSize.cs similarity index 100% rename from src/client/spark_api/MarketData/NativePriceSize.cs rename to src/cs/Bts.Spark.Api/MarketData/NativePriceSize.cs diff --git a/src/client/spark_api/MarketData/NativePriceSizeExtensions.cs b/src/cs/Bts.Spark.Api/MarketData/NativePriceSizeExtensions.cs similarity index 100% rename from src/client/spark_api/MarketData/NativePriceSizeExtensions.cs rename to src/cs/Bts.Spark.Api/MarketData/NativePriceSizeExtensions.cs diff --git a/src/client/spark_api/MarketData/PassiveSecurityResolver.cs b/src/cs/Bts.Spark.Api/MarketData/PassiveSecurityResolver.cs similarity index 100% rename from src/client/spark_api/MarketData/PassiveSecurityResolver.cs rename to src/cs/Bts.Spark.Api/MarketData/PassiveSecurityResolver.cs diff --git a/src/client/spark_api/MarketData/PollableBook.cs b/src/cs/Bts.Spark.Api/MarketData/PollableBook.cs similarity index 100% rename from src/client/spark_api/MarketData/PollableBook.cs rename to src/cs/Bts.Spark.Api/MarketData/PollableBook.cs diff --git a/src/client/spark_api/MarketData/PollablePriceStats.cs b/src/cs/Bts.Spark.Api/MarketData/PollablePriceStats.cs similarity index 100% rename from src/client/spark_api/MarketData/PollablePriceStats.cs rename to src/cs/Bts.Spark.Api/MarketData/PollablePriceStats.cs diff --git a/src/client/spark_api/MarketData/PollablePriceTicker.cs b/src/cs/Bts.Spark.Api/MarketData/PollablePriceTicker.cs similarity index 100% rename from src/client/spark_api/MarketData/PollablePriceTicker.cs rename to src/cs/Bts.Spark.Api/MarketData/PollablePriceTicker.cs diff --git a/src/client/spark_api/MarketData/PriceSize.cs b/src/cs/Bts.Spark.Api/MarketData/PriceSize.cs similarity index 100% rename from src/client/spark_api/MarketData/PriceSize.cs rename to src/cs/Bts.Spark.Api/MarketData/PriceSize.cs diff --git a/src/client/spark_api/MarketData/PriceStats.cs b/src/cs/Bts.Spark.Api/MarketData/PriceStats.cs similarity index 100% rename from src/client/spark_api/MarketData/PriceStats.cs rename to src/cs/Bts.Spark.Api/MarketData/PriceStats.cs diff --git a/src/client/spark_api/MarketData/PriceTicker.cs b/src/cs/Bts.Spark.Api/MarketData/PriceTicker.cs similarity index 100% rename from src/client/spark_api/MarketData/PriceTicker.cs rename to src/cs/Bts.Spark.Api/MarketData/PriceTicker.cs diff --git a/src/client/spark_api/MarketData/SecurityExpiration.cs b/src/cs/Bts.Spark.Api/MarketData/SecurityExpiration.cs similarity index 100% rename from src/client/spark_api/MarketData/SecurityExpiration.cs rename to src/cs/Bts.Spark.Api/MarketData/SecurityExpiration.cs diff --git a/src/client/spark_api/MarketData/SecurityMD.cs b/src/cs/Bts.Spark.Api/MarketData/SecurityMD.cs similarity index 100% rename from src/client/spark_api/MarketData/SecurityMD.cs rename to src/cs/Bts.Spark.Api/MarketData/SecurityMD.cs diff --git a/src/client/spark_api/MarketData/SecurityStrike.cs b/src/cs/Bts.Spark.Api/MarketData/SecurityStrike.cs similarity index 100% rename from src/client/spark_api/MarketData/SecurityStrike.cs rename to src/cs/Bts.Spark.Api/MarketData/SecurityStrike.cs diff --git a/src/client/spark_api/MarketData/SyntheticBookCalculator.cs b/src/cs/Bts.Spark.Api/MarketData/SyntheticBookCalculator.cs similarity index 100% rename from src/client/spark_api/MarketData/SyntheticBookCalculator.cs rename to src/cs/Bts.Spark.Api/MarketData/SyntheticBookCalculator.cs diff --git a/src/client/spark_api/MarketData/SyntheticSecurityClient.cs b/src/cs/Bts.Spark.Api/MarketData/SyntheticSecurityClient.cs similarity index 100% rename from src/client/spark_api/MarketData/SyntheticSecurityClient.cs rename to src/cs/Bts.Spark.Api/MarketData/SyntheticSecurityClient.cs diff --git a/src/client/spark_api/MarketData/SyntheticTuple.cs b/src/cs/Bts.Spark.Api/MarketData/SyntheticTuple.cs similarity index 100% rename from src/client/spark_api/MarketData/SyntheticTuple.cs rename to src/cs/Bts.Spark.Api/MarketData/SyntheticTuple.cs diff --git a/src/client/spark_api/MarketData/TimeStamp.cs b/src/cs/Bts.Spark.Api/MarketData/TimeStamp.cs similarity index 100% rename from src/client/spark_api/MarketData/TimeStamp.cs rename to src/cs/Bts.Spark.Api/MarketData/TimeStamp.cs diff --git a/src/client/spark_api/MarketData/TradeInfo.cs b/src/cs/Bts.Spark.Api/MarketData/TradeInfo.cs similarity index 100% rename from src/client/spark_api/MarketData/TradeInfo.cs rename to src/cs/Bts.Spark.Api/MarketData/TradeInfo.cs diff --git a/src/client/spark_api/MarketData/TradeMessageExtensions.cs b/src/cs/Bts.Spark.Api/MarketData/TradeMessageExtensions.cs similarity index 100% rename from src/client/spark_api/MarketData/TradeMessageExtensions.cs rename to src/cs/Bts.Spark.Api/MarketData/TradeMessageExtensions.cs diff --git a/src/client/spark_api/MarketData/TradesSource.cs b/src/cs/Bts.Spark.Api/MarketData/TradesSource.cs similarity index 100% rename from src/client/spark_api/MarketData/TradesSource.cs rename to src/cs/Bts.Spark.Api/MarketData/TradesSource.cs diff --git a/src/client/spark_api/MarketData/TradesSubscriptionFilter.cs b/src/cs/Bts.Spark.Api/MarketData/TradesSubscriptionFilter.cs similarity index 100% rename from src/client/spark_api/MarketData/TradesSubscriptionFilter.cs rename to src/cs/Bts.Spark.Api/MarketData/TradesSubscriptionFilter.cs diff --git a/src/client/spark_api/MarketData/UserSymbol.cs b/src/cs/Bts.Spark.Api/MarketData/UserSymbol.cs similarity index 100% rename from src/client/spark_api/MarketData/UserSymbol.cs rename to src/cs/Bts.Spark.Api/MarketData/UserSymbol.cs diff --git a/src/client/spark_api/Orders/AccountSecurityKey.cs b/src/cs/Bts.Spark.Api/Orders/AccountSecurityKey.cs similarity index 100% rename from src/client/spark_api/Orders/AccountSecurityKey.cs rename to src/cs/Bts.Spark.Api/Orders/AccountSecurityKey.cs diff --git a/src/client/spark_api/Orders/AccountTuple.cs b/src/cs/Bts.Spark.Api/Orders/AccountTuple.cs similarity index 100% rename from src/client/spark_api/Orders/AccountTuple.cs rename to src/cs/Bts.Spark.Api/Orders/AccountTuple.cs diff --git a/src/client/spark_api/Orders/AlgoData.cs b/src/cs/Bts.Spark.Api/Orders/AlgoData.cs similarity index 100% rename from src/client/spark_api/Orders/AlgoData.cs rename to src/cs/Bts.Spark.Api/Orders/AlgoData.cs diff --git a/src/client/spark_api/Orders/AlgoDefinitionMetadata.cs b/src/cs/Bts.Spark.Api/Orders/AlgoDefinitionMetadata.cs similarity index 100% rename from src/client/spark_api/Orders/AlgoDefinitionMetadata.cs rename to src/cs/Bts.Spark.Api/Orders/AlgoDefinitionMetadata.cs diff --git a/src/client/spark_api/Orders/AlgoDefinitionPersistedMetadata.cs b/src/cs/Bts.Spark.Api/Orders/AlgoDefinitionPersistedMetadata.cs similarity index 100% rename from src/client/spark_api/Orders/AlgoDefinitionPersistedMetadata.cs rename to src/cs/Bts.Spark.Api/Orders/AlgoDefinitionPersistedMetadata.cs diff --git a/src/client/spark_api/Orders/AlgoKey.cs b/src/cs/Bts.Spark.Api/Orders/AlgoKey.cs similarity index 100% rename from src/client/spark_api/Orders/AlgoKey.cs rename to src/cs/Bts.Spark.Api/Orders/AlgoKey.cs diff --git a/src/client/spark_api/Orders/AlgoPersistedKey.cs b/src/cs/Bts.Spark.Api/Orders/AlgoPersistedKey.cs similarity index 100% rename from src/client/spark_api/Orders/AlgoPersistedKey.cs rename to src/cs/Bts.Spark.Api/Orders/AlgoPersistedKey.cs diff --git a/src/client/spark_api/Orders/AlgoTreeEnumerator.cs b/src/cs/Bts.Spark.Api/Orders/AlgoTreeEnumerator.cs similarity index 100% rename from src/client/spark_api/Orders/AlgoTreeEnumerator.cs rename to src/cs/Bts.Spark.Api/Orders/AlgoTreeEnumerator.cs diff --git a/src/client/spark_api/Orders/AlgoTypeDescriptorData.cs b/src/cs/Bts.Spark.Api/Orders/AlgoTypeDescriptorData.cs similarity index 100% rename from src/client/spark_api/Orders/AlgoTypeDescriptorData.cs rename to src/cs/Bts.Spark.Api/Orders/AlgoTypeDescriptorData.cs diff --git a/src/client/spark_api/Orders/ChildAlgoNode.cs b/src/cs/Bts.Spark.Api/Orders/ChildAlgoNode.cs similarity index 100% rename from src/client/spark_api/Orders/ChildAlgoNode.cs rename to src/cs/Bts.Spark.Api/Orders/ChildAlgoNode.cs diff --git a/src/client/spark_api/Orders/FillTuple.cs b/src/cs/Bts.Spark.Api/Orders/FillTuple.cs similarity index 100% rename from src/client/spark_api/Orders/FillTuple.cs rename to src/cs/Bts.Spark.Api/Orders/FillTuple.cs diff --git a/src/client/spark_api/Orders/FillsSubscriptionFilter.cs b/src/cs/Bts.Spark.Api/Orders/FillsSubscriptionFilter.cs similarity index 100% rename from src/client/spark_api/Orders/FillsSubscriptionFilter.cs rename to src/cs/Bts.Spark.Api/Orders/FillsSubscriptionFilter.cs diff --git a/src/client/spark_api/Orders/IOrdersClient.cs b/src/cs/Bts.Spark.Api/Orders/IOrdersClient.cs similarity index 100% rename from src/client/spark_api/Orders/IOrdersClient.cs rename to src/cs/Bts.Spark.Api/Orders/IOrdersClient.cs diff --git a/src/client/spark_api/Orders/ManualFillTuple.cs b/src/cs/Bts.Spark.Api/Orders/ManualFillTuple.cs similarity index 100% rename from src/client/spark_api/Orders/ManualFillTuple.cs rename to src/cs/Bts.Spark.Api/Orders/ManualFillTuple.cs diff --git a/src/client/spark_api/Orders/ManualFillsSubscriptionFilter.cs b/src/cs/Bts.Spark.Api/Orders/ManualFillsSubscriptionFilter.cs similarity index 100% rename from src/client/spark_api/Orders/ManualFillsSubscriptionFilter.cs rename to src/cs/Bts.Spark.Api/Orders/ManualFillsSubscriptionFilter.cs diff --git a/src/client/spark_api/Orders/OrderCollectionSummarizer.cs b/src/cs/Bts.Spark.Api/Orders/OrderCollectionSummarizer.cs similarity index 100% rename from src/client/spark_api/Orders/OrderCollectionSummarizer.cs rename to src/cs/Bts.Spark.Api/Orders/OrderCollectionSummarizer.cs diff --git a/src/client/spark_api/Orders/OrderDataHelper.cs b/src/cs/Bts.Spark.Api/Orders/OrderDataHelper.cs similarity index 100% rename from src/client/spark_api/Orders/OrderDataHelper.cs rename to src/cs/Bts.Spark.Api/Orders/OrderDataHelper.cs diff --git a/src/client/spark_api/Orders/OrderEqualityComparer.cs b/src/cs/Bts.Spark.Api/Orders/OrderEqualityComparer.cs similarity index 100% rename from src/client/spark_api/Orders/OrderEqualityComparer.cs rename to src/cs/Bts.Spark.Api/Orders/OrderEqualityComparer.cs diff --git a/src/client/spark_api/Orders/OrderPriceComparer.cs b/src/cs/Bts.Spark.Api/Orders/OrderPriceComparer.cs similarity index 100% rename from src/client/spark_api/Orders/OrderPriceComparer.cs rename to src/cs/Bts.Spark.Api/Orders/OrderPriceComparer.cs diff --git a/src/client/spark_api/Orders/OrderRecordTuple.cs b/src/cs/Bts.Spark.Api/Orders/OrderRecordTuple.cs similarity index 100% rename from src/client/spark_api/Orders/OrderRecordTuple.cs rename to src/cs/Bts.Spark.Api/Orders/OrderRecordTuple.cs diff --git a/src/client/spark_api/Orders/OrderTypeSets.cs b/src/cs/Bts.Spark.Api/Orders/OrderTypeSets.cs similarity index 100% rename from src/client/spark_api/Orders/OrderTypeSets.cs rename to src/cs/Bts.Spark.Api/Orders/OrderTypeSets.cs diff --git a/src/client/spark_api/Orders/OrdersClient.cs b/src/cs/Bts.Spark.Api/Orders/OrdersClient.cs similarity index 100% rename from src/client/spark_api/Orders/OrdersClient.cs rename to src/cs/Bts.Spark.Api/Orders/OrdersClient.cs diff --git a/src/client/spark_api/Orders/OrdersExtensions.cs b/src/cs/Bts.Spark.Api/Orders/OrdersExtensions.cs similarity index 100% rename from src/client/spark_api/Orders/OrdersExtensions.cs rename to src/cs/Bts.Spark.Api/Orders/OrdersExtensions.cs diff --git a/src/client/spark_api/Orders/OrdersSubscriptionFilter.cs b/src/cs/Bts.Spark.Api/Orders/OrdersSubscriptionFilter.cs similarity index 100% rename from src/client/spark_api/Orders/OrdersSubscriptionFilter.cs rename to src/cs/Bts.Spark.Api/Orders/OrdersSubscriptionFilter.cs diff --git a/src/client/spark_api/Orders/WorkingOrderData.cs b/src/cs/Bts.Spark.Api/Orders/WorkingOrderData.cs similarity index 100% rename from src/client/spark_api/Orders/WorkingOrderData.cs rename to src/cs/Bts.Spark.Api/Orders/WorkingOrderData.cs diff --git a/src/client/spark_api/Orders/WorkingOrdersSideData.cs b/src/cs/Bts.Spark.Api/Orders/WorkingOrdersSideData.cs similarity index 100% rename from src/client/spark_api/Orders/WorkingOrdersSideData.cs rename to src/cs/Bts.Spark.Api/Orders/WorkingOrdersSideData.cs diff --git a/src/client/spark_api/Position/DayFillsDataSource.cs b/src/cs/Bts.Spark.Api/Position/DayFillsDataSource.cs similarity index 100% rename from src/client/spark_api/Position/DayFillsDataSource.cs rename to src/cs/Bts.Spark.Api/Position/DayFillsDataSource.cs diff --git a/src/client/spark_api/Position/DayFillsMatchType.cs b/src/cs/Bts.Spark.Api/Position/DayFillsMatchType.cs similarity index 100% rename from src/client/spark_api/Position/DayFillsMatchType.cs rename to src/cs/Bts.Spark.Api/Position/DayFillsMatchType.cs diff --git a/src/client/spark_api/Position/DayFillsRowData.cs b/src/cs/Bts.Spark.Api/Position/DayFillsRowData.cs similarity index 100% rename from src/client/spark_api/Position/DayFillsRowData.cs rename to src/cs/Bts.Spark.Api/Position/DayFillsRowData.cs diff --git a/src/client/spark_api/Position/DayFillsRowKey.cs b/src/cs/Bts.Spark.Api/Position/DayFillsRowKey.cs similarity index 100% rename from src/client/spark_api/Position/DayFillsRowKey.cs rename to src/cs/Bts.Spark.Api/Position/DayFillsRowKey.cs diff --git a/src/client/spark_api/Position/IPNLTradeRow.cs b/src/cs/Bts.Spark.Api/Position/IPNLTradeRow.cs similarity index 100% rename from src/client/spark_api/Position/IPNLTradeRow.cs rename to src/cs/Bts.Spark.Api/Position/IPNLTradeRow.cs diff --git a/src/client/spark_api/Position/IPNLUnit.cs b/src/cs/Bts.Spark.Api/Position/IPNLUnit.cs similarity index 100% rename from src/client/spark_api/Position/IPNLUnit.cs rename to src/cs/Bts.Spark.Api/Position/IPNLUnit.cs diff --git a/src/client/spark_api/Position/IPositionModel.cs b/src/cs/Bts.Spark.Api/Position/IPositionModel.cs similarity index 100% rename from src/client/spark_api/Position/IPositionModel.cs rename to src/cs/Bts.Spark.Api/Position/IPositionModel.cs diff --git a/src/client/spark_api/Position/ITradeLogRow.cs b/src/cs/Bts.Spark.Api/Position/ITradeLogRow.cs similarity index 100% rename from src/client/spark_api/Position/ITradeLogRow.cs rename to src/cs/Bts.Spark.Api/Position/ITradeLogRow.cs diff --git a/src/client/spark_api/Position/PNLData.cs b/src/cs/Bts.Spark.Api/Position/PNLData.cs similarity index 100% rename from src/client/spark_api/Position/PNLData.cs rename to src/cs/Bts.Spark.Api/Position/PNLData.cs diff --git a/src/client/spark_api/Position/PNLNormalizedData.cs b/src/cs/Bts.Spark.Api/Position/PNLNormalizedData.cs similarity index 100% rename from src/client/spark_api/Position/PNLNormalizedData.cs rename to src/cs/Bts.Spark.Api/Position/PNLNormalizedData.cs diff --git a/src/client/spark_api/Position/PNLRowData.cs b/src/cs/Bts.Spark.Api/Position/PNLRowData.cs similarity index 100% rename from src/client/spark_api/Position/PNLRowData.cs rename to src/cs/Bts.Spark.Api/Position/PNLRowData.cs diff --git a/src/client/spark_api/Position/PositionExtensions.cs b/src/cs/Bts.Spark.Api/Position/PositionExtensions.cs similarity index 100% rename from src/client/spark_api/Position/PositionExtensions.cs rename to src/cs/Bts.Spark.Api/Position/PositionExtensions.cs diff --git a/src/client/spark_api/Position/PositionGreeks.cs b/src/cs/Bts.Spark.Api/Position/PositionGreeks.cs similarity index 100% rename from src/client/spark_api/Position/PositionGreeks.cs rename to src/cs/Bts.Spark.Api/Position/PositionGreeks.cs diff --git a/src/client/spark_api/Position/PositionModel.cs b/src/cs/Bts.Spark.Api/Position/PositionModel.cs similarity index 100% rename from src/client/spark_api/Position/PositionModel.cs rename to src/cs/Bts.Spark.Api/Position/PositionModel.cs diff --git a/src/client/spark_api/Position/PositionModelExtensions.cs b/src/cs/Bts.Spark.Api/Position/PositionModelExtensions.cs similarity index 100% rename from src/client/spark_api/Position/PositionModelExtensions.cs rename to src/cs/Bts.Spark.Api/Position/PositionModelExtensions.cs diff --git a/src/client/spark_api/Position/PositionPriceSize.cs b/src/cs/Bts.Spark.Api/Position/PositionPriceSize.cs similarity index 100% rename from src/client/spark_api/Position/PositionPriceSize.cs rename to src/cs/Bts.Spark.Api/Position/PositionPriceSize.cs diff --git a/src/client/spark_api/Position/PositionPriceSizeWithGreeks.cs b/src/cs/Bts.Spark.Api/Position/PositionPriceSizeWithGreeks.cs similarity index 100% rename from src/client/spark_api/Position/PositionPriceSizeWithGreeks.cs rename to src/cs/Bts.Spark.Api/Position/PositionPriceSizeWithGreeks.cs diff --git a/src/client/spark_api/Position/ReconcileReportDataSource.cs b/src/cs/Bts.Spark.Api/Position/ReconcileReportDataSource.cs similarity index 100% rename from src/client/spark_api/Position/ReconcileReportDataSource.cs rename to src/cs/Bts.Spark.Api/Position/ReconcileReportDataSource.cs diff --git a/src/client/spark_api/Position/ReconcileReportMatchType.cs b/src/cs/Bts.Spark.Api/Position/ReconcileReportMatchType.cs similarity index 100% rename from src/client/spark_api/Position/ReconcileReportMatchType.cs rename to src/cs/Bts.Spark.Api/Position/ReconcileReportMatchType.cs diff --git a/src/client/spark_api/Position/ReconcileReportRowData.cs b/src/cs/Bts.Spark.Api/Position/ReconcileReportRowData.cs similarity index 100% rename from src/client/spark_api/Position/ReconcileReportRowData.cs rename to src/cs/Bts.Spark.Api/Position/ReconcileReportRowData.cs diff --git a/src/client/spark_api/Properties/AssemblyAttributes.cs b/src/cs/Bts.Spark.Api/Properties/AssemblyAttributes.cs similarity index 96% rename from src/client/spark_api/Properties/AssemblyAttributes.cs rename to src/cs/Bts.Spark.Api/Properties/AssemblyAttributes.cs index ce79a60b2..918d0c7f2 100644 --- a/src/client/spark_api/Properties/AssemblyAttributes.cs +++ b/src/cs/Bts.Spark.Api/Properties/AssemblyAttributes.cs @@ -1,4 +1,4 @@ -using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("spark")] -[assembly: InternalsVisibleTo("spark_test")] - +using System.Runtime.CompilerServices; +[assembly: InternalsVisibleTo("spark")] +[assembly: InternalsVisibleTo("spark_test")] + diff --git a/src/client/spark_api/Reactive/SecurityResolver.cs b/src/cs/Bts.Spark.Api/Reactive/SecurityResolver.cs similarity index 100% rename from src/client/spark_api/Reactive/SecurityResolver.cs rename to src/cs/Bts.Spark.Api/Reactive/SecurityResolver.cs diff --git a/src/client/spark_api/Services/CachedServiceProvider.cs b/src/cs/Bts.Spark.Api/Services/CachedServiceProvider.cs similarity index 100% rename from src/client/spark_api/Services/CachedServiceProvider.cs rename to src/cs/Bts.Spark.Api/Services/CachedServiceProvider.cs diff --git a/src/client/spark_api/Services/ISparkdLoginService.cs b/src/cs/Bts.Spark.Api/Services/ISparkdLoginService.cs similarity index 100% rename from src/client/spark_api/Services/ISparkdLoginService.cs rename to src/cs/Bts.Spark.Api/Services/ISparkdLoginService.cs diff --git a/src/client/spark_api/Services/IUserDataPermissions.cs b/src/cs/Bts.Spark.Api/Services/IUserDataPermissions.cs similarity index 100% rename from src/client/spark_api/Services/IUserDataPermissions.cs rename to src/cs/Bts.Spark.Api/Services/IUserDataPermissions.cs diff --git a/src/client/spark_api/Services/SparkApiServices.cs b/src/cs/Bts.Spark.Api/Services/SparkApiServices.cs similarity index 100% rename from src/client/spark_api/Services/SparkApiServices.cs rename to src/cs/Bts.Spark.Api/Services/SparkApiServices.cs diff --git a/src/client/spark_api/Services/SparkdCredentials.cs b/src/cs/Bts.Spark.Api/Services/SparkdCredentials.cs similarity index 100% rename from src/client/spark_api/Services/SparkdCredentials.cs rename to src/cs/Bts.Spark.Api/Services/SparkdCredentials.cs diff --git a/src/client/spark_api/Services/SparkdLoginService.cs b/src/cs/Bts.Spark.Api/Services/SparkdLoginService.cs similarity index 100% rename from src/client/spark_api/Services/SparkdLoginService.cs rename to src/cs/Bts.Spark.Api/Services/SparkdLoginService.cs diff --git a/src/client/spark_api/Services/UserDataPermissions.cs b/src/cs/Bts.Spark.Api/Services/UserDataPermissions.cs similarity index 100% rename from src/client/spark_api/Services/UserDataPermissions.cs rename to src/cs/Bts.Spark.Api/Services/UserDataPermissions.cs diff --git a/src/client/spark_api/api/ApiException.cs b/src/cs/Bts.Spark.Api/api/ApiException.cs similarity index 100% rename from src/client/spark_api/api/ApiException.cs rename to src/cs/Bts.Spark.Api/api/ApiException.cs diff --git a/src/client/spark_api/api/ApiNativeMethods.cs b/src/cs/Bts.Spark.Api/api/ApiNativeMethods.cs similarity index 100% rename from src/client/spark_api/api/ApiNativeMethods.cs rename to src/cs/Bts.Spark.Api/api/ApiNativeMethods.cs diff --git a/src/client/spark_api/api/ApiServer.cs b/src/cs/Bts.Spark.Api/api/ApiServer.cs similarity index 96% rename from src/client/spark_api/api/ApiServer.cs rename to src/cs/Bts.Spark.Api/api/ApiServer.cs index 6e7f08c95..7d7da1469 100644 --- a/src/client/spark_api/api/ApiServer.cs +++ b/src/cs/Bts.Spark.Api/api/ApiServer.cs @@ -1,38 +1,38 @@ -using Google.Protobuf; -using Google.Protobuf.WellKnownTypes; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; - -namespace bts.api.core -{ - internal interface IApiServer - { - void dispatch(RequestHeader header, Stream request, Action on_response); - } - - internal abstract class ApiServer : IApiServer - { - public abstract void dispatch(RequestHeader header, Stream request, Action on_response); - - protected void respond(int request_id, Task task, Action on_response) where T : IMessage, IImmutableMessage { - var header = new ResponseHeader() { RequestId = request_id }; - if (task.IsCanceled || task.IsFaulted) { - header.Code = ApiError.ServerFault; - on_response(header.serialize()); - } - else if (task.IsCompleted) { - header.Code = ApiError.Success; - on_response(header.serialize(task.Result)); - } - } - } - - - - -} +using Google.Protobuf; +using Google.Protobuf.WellKnownTypes; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; + +namespace bts.api.core +{ + internal interface IApiServer + { + void dispatch(RequestHeader header, Stream request, Action on_response); + } + + internal abstract class ApiServer : IApiServer + { + public abstract void dispatch(RequestHeader header, Stream request, Action on_response); + + protected void respond(int request_id, Task task, Action on_response) where T : IMessage, IImmutableMessage { + var header = new ResponseHeader() { RequestId = request_id }; + if (task.IsCanceled || task.IsFaulted) { + header.Code = ApiError.ServerFault; + on_response(header.serialize()); + } + else if (task.IsCompleted) { + header.Code = ApiError.Success; + on_response(header.serialize(task.Result)); + } + } + } + + + + +} diff --git a/src/client/spark_api/api/ApiUtils.cs b/src/cs/Bts.Spark.Api/api/ApiUtils.cs similarity index 97% rename from src/client/spark_api/api/ApiUtils.cs rename to src/cs/Bts.Spark.Api/api/ApiUtils.cs index 73f7c7545..ea797f7cb 100644 --- a/src/client/spark_api/api/ApiUtils.cs +++ b/src/cs/Bts.Spark.Api/api/ApiUtils.cs @@ -1,68 +1,68 @@ -using bts.api.core; -using Google.Protobuf; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace bts.api { - internal static class ApiUtils { - - public static byte[] serialize(this RequestHeader header, T body) where T : IImmutableMessage { - int body_size = body?.CalculateSize() ?? 0; - int header_size = header.CalculateSize() + 1; // 1 byte header length - var buffer = new byte[header_size + body_size]; - using (var stream = new MemoryStream(buffer)) { - checked { stream.WriteByte((byte)header_size); } - header.WriteTo(stream); - if (body != null) body.WriteTo(stream); - } - - return buffer; - } - - public struct DeserializeResult { - public THeader header; - public TBody body; - } - - private static DeserializeResult mkresult(THeader header, TBody body) { - return new DeserializeResult() { header = header, body = body }; } - - public static unsafe DeserializeResult deserialize(byte* buffer, long buffer_length) where THeader : IMessage, new() where TBody : class, IMessage, new() { - var header_size = buffer[0]; - Debug.Assert(header_size <= buffer_length); - THeader header = new THeader(); - header.MergeFrom(new UnmanagedMemoryStream(buffer + 1, header_size - 1)); - TBody body = new TBody(); - if (buffer_length > header_size) { - body.MergeFrom(new UnmanagedMemoryStream(buffer + header_size, buffer_length - header_size)); - } - return mkresult(header, body); - } - - public static byte[] serialize(this ResponseHeader header, T body) where T : IImmutableMessage { - int header_size = 1 + header.CalculateSize(); - int body_size = body == null ? 0 : body.CalculateSize(); - var buffer = new byte[header_size + body_size]; - using (var stream = new MemoryStream(buffer)) { - checked { stream.WriteByte((byte)header_size); } - header.WriteTo(stream); - if (body != null) body.WriteTo(stream); - } - return buffer; - } - public static byte[] serialize(this ResponseHeader header) { - int header_size = 1 + header.CalculateSize(); - var buffer = new byte[header_size]; - using (var stream = new MemoryStream(buffer)) { - checked { stream.WriteByte((byte)header_size); } - header.WriteTo(stream); - } - return buffer; - } - } -} +using bts.api.core; +using Google.Protobuf; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace bts.api { + internal static class ApiUtils { + + public static byte[] serialize(this RequestHeader header, T body) where T : IImmutableMessage { + int body_size = body?.CalculateSize() ?? 0; + int header_size = header.CalculateSize() + 1; // 1 byte header length + var buffer = new byte[header_size + body_size]; + using (var stream = new MemoryStream(buffer)) { + checked { stream.WriteByte((byte)header_size); } + header.WriteTo(stream); + if (body != null) body.WriteTo(stream); + } + + return buffer; + } + + public struct DeserializeResult { + public THeader header; + public TBody body; + } + + private static DeserializeResult mkresult(THeader header, TBody body) { + return new DeserializeResult() { header = header, body = body }; } + + public static unsafe DeserializeResult deserialize(byte* buffer, long buffer_length) where THeader : IMessage, new() where TBody : class, IMessage, new() { + var header_size = buffer[0]; + Debug.Assert(header_size <= buffer_length); + THeader header = new THeader(); + header.MergeFrom(new UnmanagedMemoryStream(buffer + 1, header_size - 1)); + TBody body = new TBody(); + if (buffer_length > header_size) { + body.MergeFrom(new UnmanagedMemoryStream(buffer + header_size, buffer_length - header_size)); + } + return mkresult(header, body); + } + + public static byte[] serialize(this ResponseHeader header, T body) where T : IImmutableMessage { + int header_size = 1 + header.CalculateSize(); + int body_size = body == null ? 0 : body.CalculateSize(); + var buffer = new byte[header_size + body_size]; + using (var stream = new MemoryStream(buffer)) { + checked { stream.WriteByte((byte)header_size); } + header.WriteTo(stream); + if (body != null) body.WriteTo(stream); + } + return buffer; + } + public static byte[] serialize(this ResponseHeader header) { + int header_size = 1 + header.CalculateSize(); + var buffer = new byte[header_size]; + using (var stream = new MemoryStream(buffer)) { + checked { stream.WriteByte((byte)header_size); } + header.WriteTo(stream); + } + return buffer; + } + } +} diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/cs/Bts.Spark.Api/api/Channels/QuickBusClientChannel.cs similarity index 100% rename from src/client/spark_api/api/Channels/QuickBusClientChannel.cs rename to src/cs/Bts.Spark.Api/api/Channels/QuickBusClientChannel.cs diff --git a/src/client/spark_api/api/ClientChannel.cs b/src/cs/Bts.Spark.Api/api/ClientChannel.cs similarity index 100% rename from src/client/spark_api/api/ClientChannel.cs rename to src/cs/Bts.Spark.Api/api/ClientChannel.cs diff --git a/src/client/spark_api/api/IApiClient.cs b/src/cs/Bts.Spark.Api/api/IApiClient.cs similarity index 96% rename from src/client/spark_api/api/IApiClient.cs rename to src/cs/Bts.Spark.Api/api/IApiClient.cs index b78afbac7..cd4952c0d 100644 --- a/src/client/spark_api/api/IApiClient.cs +++ b/src/cs/Bts.Spark.Api/api/IApiClient.cs @@ -1,11 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + namespace bts.api.core -{ +{ // Marker public interface IApiClient { } -} +} diff --git a/src/client/spark_api/api/ManagedQuickbusWrapper.cs b/src/cs/Bts.Spark.Api/api/ManagedQuickbusWrapper.cs similarity index 100% rename from src/client/spark_api/api/ManagedQuickbusWrapper.cs rename to src/cs/Bts.Spark.Api/api/ManagedQuickbusWrapper.cs diff --git a/src/client/spark_api/api/Result.cs b/src/cs/Bts.Spark.Api/api/Result.cs similarity index 96% rename from src/client/spark_api/api/Result.cs rename to src/cs/Bts.Spark.Api/api/Result.cs index ab2c3b3b2..5680ffaed 100644 --- a/src/client/spark_api/api/Result.cs +++ b/src/cs/Bts.Spark.Api/api/Result.cs @@ -1,50 +1,50 @@ -using System.Collections.Generic; - -namespace bts.api.core { - public readonly struct Result { - readonly T _result; - - public Result(T v) { - _result = v; - code = ApiError.Success; - } - - public Result(ApiError code) { - System.Diagnostics.Debug.Assert(code != ApiError.Success); - this.code = code; - _result = default; - } - - public T value { - get { - if (success) { - return _result; - } - if (typeof(T).IsValueType) { - throw new ApiException(error_message); - } - return default; - } - } - - public bool success => - code == ApiError.Success; - - public ApiError code { get; } - - public string error_message => - code switch { - ApiError.Success => "Success", - ApiError.NoServer => "No server found.", - ApiError.ServerDisconnect => "Server disconnected.", - ApiError.MissingMethod => "Method not found.", - ApiError.ServerFault => "Server error.", - ApiError.AccessDenied => "Access denied", - _ => "Unknown error", - }; - - - public override string ToString() => - error_message.is_null_or_empty() ? code.ToString() : $"{code}: {error_message}"; - } -} +using System.Collections.Generic; + +namespace bts.api.core { + public readonly struct Result { + readonly T _result; + + public Result(T v) { + _result = v; + code = ApiError.Success; + } + + public Result(ApiError code) { + System.Diagnostics.Debug.Assert(code != ApiError.Success); + this.code = code; + _result = default; + } + + public T value { + get { + if (success) { + return _result; + } + if (typeof(T).IsValueType) { + throw new ApiException(error_message); + } + return default; + } + } + + public bool success => + code == ApiError.Success; + + public ApiError code { get; } + + public string error_message => + code switch { + ApiError.Success => "Success", + ApiError.NoServer => "No server found.", + ApiError.ServerDisconnect => "Server disconnected.", + ApiError.MissingMethod => "Method not found.", + ApiError.ServerFault => "Server error.", + ApiError.AccessDenied => "Access denied", + _ => "Unknown error", + }; + + + public override string ToString() => + error_message.is_null_or_empty() ? code.ToString() : $"{code}: {error_message}"; + } +} diff --git a/src/client/spark_api/api/ServerChannel.cs b/src/cs/Bts.Spark.Api/api/ServerChannel.cs similarity index 100% rename from src/client/spark_api/api/ServerChannel.cs rename to src/cs/Bts.Spark.Api/api/ServerChannel.cs diff --git a/src/client/spark_api/api/ServiceContext.cs b/src/cs/Bts.Spark.Api/api/ServiceContext.cs similarity index 100% rename from src/client/spark_api/api/ServiceContext.cs rename to src/cs/Bts.Spark.Api/api/ServiceContext.cs diff --git a/src/client/spark_api/data/DisplayQuantityMultiplier.cs b/src/cs/Bts.Spark.Api/data/DisplayQuantityMultiplier.cs similarity index 100% rename from src/client/spark_api/data/DisplayQuantityMultiplier.cs rename to src/cs/Bts.Spark.Api/data/DisplayQuantityMultiplier.cs diff --git a/src/client/spark_api/data/ExpirationDate.cs b/src/cs/Bts.Spark.Api/data/ExpirationDate.cs similarity index 100% rename from src/client/spark_api/data/ExpirationDate.cs rename to src/cs/Bts.Spark.Api/data/ExpirationDate.cs diff --git a/src/client/spark_api/data/IDisplayTranslator.cs b/src/cs/Bts.Spark.Api/data/IDisplayTranslator.cs similarity index 100% rename from src/client/spark_api/data/IDisplayTranslator.cs rename to src/cs/Bts.Spark.Api/data/IDisplayTranslator.cs diff --git a/src/client/spark_api/data/ISecurityMetadataStore.cs b/src/cs/Bts.Spark.Api/data/ISecurityMetadataStore.cs similarity index 100% rename from src/client/spark_api/data/ISecurityMetadataStore.cs rename to src/cs/Bts.Spark.Api/data/ISecurityMetadataStore.cs diff --git a/src/client/spark_api/data/QuantityConversionData.cs b/src/cs/Bts.Spark.Api/data/QuantityConversionData.cs similarity index 100% rename from src/client/spark_api/data/QuantityConversionData.cs rename to src/cs/Bts.Spark.Api/data/QuantityConversionData.cs diff --git a/src/client/spark_api/data/SecurityCriteria.cs b/src/cs/Bts.Spark.Api/data/SecurityCriteria.cs similarity index 100% rename from src/client/spark_api/data/SecurityCriteria.cs rename to src/cs/Bts.Spark.Api/data/SecurityCriteria.cs diff --git a/src/client/spark_api/data/SecurityCriteriaClause.cs b/src/cs/Bts.Spark.Api/data/SecurityCriteriaClause.cs similarity index 100% rename from src/client/spark_api/data/SecurityCriteriaClause.cs rename to src/cs/Bts.Spark.Api/data/SecurityCriteriaClause.cs diff --git a/src/client/spark_api/data/SecurityCriteriaExtensions.cs b/src/cs/Bts.Spark.Api/data/SecurityCriteriaExtensions.cs similarity index 100% rename from src/client/spark_api/data/SecurityCriteriaExtensions.cs rename to src/cs/Bts.Spark.Api/data/SecurityCriteriaExtensions.cs diff --git a/src/client/spark_api/data/SecurityCriterionTypes.cs b/src/cs/Bts.Spark.Api/data/SecurityCriterionTypes.cs similarity index 100% rename from src/client/spark_api/data/SecurityCriterionTypes.cs rename to src/cs/Bts.Spark.Api/data/SecurityCriterionTypes.cs diff --git a/src/client/spark_api/data/SecurityMetadataStore.cs b/src/cs/Bts.Spark.Api/data/SecurityMetadataStore.cs similarity index 100% rename from src/client/spark_api/data/SecurityMetadataStore.cs rename to src/cs/Bts.Spark.Api/data/SecurityMetadataStore.cs diff --git a/src/client/spark_api/data/SecurityTuple.cs b/src/cs/Bts.Spark.Api/data/SecurityTuple.cs similarity index 100% rename from src/client/spark_api/data/SecurityTuple.cs rename to src/cs/Bts.Spark.Api/data/SecurityTuple.cs diff --git a/src/client/spark_api/data/UserTuple.cs b/src/cs/Bts.Spark.Api/data/UserTuple.cs similarity index 97% rename from src/client/spark_api/data/UserTuple.cs rename to src/cs/Bts.Spark.Api/data/UserTuple.cs index 33caa87dc..c51bb9dc4 100644 --- a/src/client/spark_api/data/UserTuple.cs +++ b/src/cs/Bts.Spark.Api/data/UserTuple.cs @@ -1,51 +1,51 @@ -using System; - -namespace bts { - public readonly struct UserTuple : IEquatable, IComparable, IComparable { - const string _admin_name = "bts"; - - public static readonly Func key_fn = u => u.id; - public static UserTuple admin => new UserTuple(0, _admin_name, Permissions.Admin); - - public readonly uint id; - public readonly string name; - public readonly Permissions permissions; - - public UserTuple(uint id, string name) - : this(id, name, name == _admin_name ? Permissions.Admin : Permissions.Regular) { } - - public UserTuple(uint id, string name, Permissions permissions) { - this.id = id; - this.name = name; - this.permissions = permissions; - } - - public enum Permissions { - Regular, - Admin - } - - public static UserTuple empty => new(0, string.Empty); - - public int CompareTo(UserTuple other) { - int comp = string.Compare(name, other.name); - return comp == 0 ? id.CompareTo(other.id) : comp; - } - - int IComparable.CompareTo(object obj) => - obj is UserTuple other ? CompareTo(other) : 1; - - public bool Equals(UserTuple other) => other.id == id && other.name == name; - public override bool Equals(object obj) => obj is UserTuple other && Equals(other); - public override int GetHashCode() => id.GetHashCode(); - public override string ToString() => name; - - public static bool operator ==(UserTuple a, UserTuple b) => a.Equals(b); - public static bool operator !=(UserTuple a, UserTuple b) => !a.Equals(b); - } - - public static class UserTupleExtensions { - public static bool can_access_user_data(this UserTuple user, uint user_id) => - user.id == user_id || user.permissions == UserTuple.Permissions.Admin; - } -} +using System; + +namespace bts { + public readonly struct UserTuple : IEquatable, IComparable, IComparable { + const string _admin_name = "bts"; + + public static readonly Func key_fn = u => u.id; + public static UserTuple admin => new UserTuple(0, _admin_name, Permissions.Admin); + + public readonly uint id; + public readonly string name; + public readonly Permissions permissions; + + public UserTuple(uint id, string name) + : this(id, name, name == _admin_name ? Permissions.Admin : Permissions.Regular) { } + + public UserTuple(uint id, string name, Permissions permissions) { + this.id = id; + this.name = name; + this.permissions = permissions; + } + + public enum Permissions { + Regular, + Admin + } + + public static UserTuple empty => new(0, string.Empty); + + public int CompareTo(UserTuple other) { + int comp = string.Compare(name, other.name); + return comp == 0 ? id.CompareTo(other.id) : comp; + } + + int IComparable.CompareTo(object obj) => + obj is UserTuple other ? CompareTo(other) : 1; + + public bool Equals(UserTuple other) => other.id == id && other.name == name; + public override bool Equals(object obj) => obj is UserTuple other && Equals(other); + public override int GetHashCode() => id.GetHashCode(); + public override string ToString() => name; + + public static bool operator ==(UserTuple a, UserTuple b) => a.Equals(b); + public static bool operator !=(UserTuple a, UserTuple b) => !a.Equals(b); + } + + public static class UserTupleExtensions { + public static bool can_access_user_data(this UserTuple user, uint user_id) => + user.id == user_id || user.permissions == UserTuple.Permissions.Admin; + } +} diff --git a/src/client/spark_api/data/ticks/RegionalTickFactors.cs b/src/cs/Bts.Spark.Api/data/ticks/RegionalTickFactors.cs similarity index 100% rename from src/client/spark_api/data/ticks/RegionalTickFactors.cs rename to src/cs/Bts.Spark.Api/data/ticks/RegionalTickFactors.cs diff --git a/src/client/spark_api/data/ticks/SecurityTickSettings.cs b/src/cs/Bts.Spark.Api/data/ticks/SecurityTickSettings.cs similarity index 100% rename from src/client/spark_api/data/ticks/SecurityTickSettings.cs rename to src/cs/Bts.Spark.Api/data/ticks/SecurityTickSettings.cs diff --git a/src/client/spark_api/data/ticks/TickDisplaySettings.cs b/src/cs/Bts.Spark.Api/data/ticks/TickDisplaySettings.cs similarity index 100% rename from src/client/spark_api/data/ticks/TickDisplaySettings.cs rename to src/cs/Bts.Spark.Api/data/ticks/TickDisplaySettings.cs diff --git a/src/client/spark_api/data/ticks/TickDisplaySettingsTuple.cs b/src/cs/Bts.Spark.Api/data/ticks/TickDisplaySettingsTuple.cs similarity index 100% rename from src/client/spark_api/data/ticks/TickDisplaySettingsTuple.cs rename to src/cs/Bts.Spark.Api/data/ticks/TickDisplaySettingsTuple.cs diff --git a/src/client/spark_api/data/ticks/TickExtensions.cs b/src/cs/Bts.Spark.Api/data/ticks/TickExtensions.cs similarity index 100% rename from src/client/spark_api/data/ticks/TickExtensions.cs rename to src/cs/Bts.Spark.Api/data/ticks/TickExtensions.cs diff --git a/src/client/spark_api/data/ticks/TickFactors.cs b/src/cs/Bts.Spark.Api/data/ticks/TickFactors.cs similarity index 100% rename from src/client/spark_api/data/ticks/TickFactors.cs rename to src/cs/Bts.Spark.Api/data/ticks/TickFactors.cs diff --git a/src/client/spark_api/data/ticks/TickFactorsFactory.cs b/src/cs/Bts.Spark.Api/data/ticks/TickFactorsFactory.cs similarity index 100% rename from src/client/spark_api/data/ticks/TickFactorsFactory.cs rename to src/cs/Bts.Spark.Api/data/ticks/TickFactorsFactory.cs diff --git a/src/client/spark_api/data/ticks/TickUtils.cs b/src/cs/Bts.Spark.Api/data/ticks/TickUtils.cs similarity index 100% rename from src/client/spark_api/data/ticks/TickUtils.cs rename to src/cs/Bts.Spark.Api/data/ticks/TickUtils.cs diff --git a/src/client/spark_api/security/ContractLegEnumerable.cs b/src/cs/Bts.Spark.Api/security/ContractLegEnumerable.cs similarity index 100% rename from src/client/spark_api/security/ContractLegEnumerable.cs rename to src/cs/Bts.Spark.Api/security/ContractLegEnumerable.cs diff --git a/src/client/spark_api/security/DateFormat.cs b/src/cs/Bts.Spark.Api/security/DateFormat.cs similarity index 100% rename from src/client/spark_api/security/DateFormat.cs rename to src/cs/Bts.Spark.Api/security/DateFormat.cs diff --git a/src/client/spark_api/security/DateFormatter.cs b/src/cs/Bts.Spark.Api/security/DateFormatter.cs similarity index 97% rename from src/client/spark_api/security/DateFormatter.cs rename to src/cs/Bts.Spark.Api/security/DateFormatter.cs index 6be48ae79..c393a4719 100644 --- a/src/client/spark_api/security/DateFormatter.cs +++ b/src/cs/Bts.Spark.Api/security/DateFormatter.cs @@ -1,104 +1,104 @@ -namespace bts.api { - using System; - using System.Globalization; - using System.Text.RegularExpressions; - - public static class DateFormatter { - static readonly string[] _month_codes = new string[] { - "F", "G", "H", "J", "K", "M", "N", "Q", "U", "V", "X", "Z" - }; - static readonly string[] _month_abvs = new string[] { - "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" - }; - - public static bool TryParse(char c, out DateFormat result) { - switch (c) { - case 's': result = DateFormat.Standard; break; - case 'a': result = DateFormat.MonthAbvDiff2000; break; - case 'c': result = DateFormat.MonthCodeDiff2000; break; - case 'l': result = DateFormat.MonthCodeLastDigitYear; break; - case 'A': result = DateFormat.DayMonthAbvDiff2000; break; - case 'C': result = DateFormat.DayMonthCodeDiff2000; break; - default: - result = DateFormat.Standard; - return false; - } - return true; - } - - /// - /// Returns a concise string representation of a date (using single-letter month codes) - /// appropriate for UIs (e.g. March 22, 2019: 22 Mar 19, or 22 H19). - /// - public static string Format(DateTime date, DateFormat format) => - Format(date.Year, date.Month, date.Day, format); - - /// - /// Returns a concise string representation of a date (using single-letter month codes) - /// appropriate for UIs (e.g. March 22, 2019: 22 Mar 19, or 22 H19). - /// - public static string Format(int year, int month, int day, DateFormat format) => - format switch { - DateFormat.MonthAbvDiff2000 => $"{GetMonthAbv(month)}{year - 2000}", - DateFormat.MonthCodeDiff2000 => $"{GetMonthCode(month)}{year - 2000}", - DateFormat.MonthCodeLastDigitYear => $"{GetMonthCode(month)}{year % 10}", - DateFormat.DayMonthAbvDiff2000 => $"{day}{GetMonthAbv(month)}{year - 2000}", - DateFormat.DayMonthCodeDiff2000 => $"{day}{GetMonthCode(month)}{year - 2000}", - _ => $"{month}/{day}/{year}", - }; - - public static string Format(string month_code_and_single_digit_year) { - string pattern = $"[{string.Concat(_month_codes)}[0-9]"; - if (Regex.Match(month_code_and_single_digit_year, pattern).Success) { - int month_index = Array.IndexOf(_month_codes, month_code_and_single_digit_year[0].ToString()); - int single_digit_year = int.Parse(month_code_and_single_digit_year[1].ToString()); - string now_single_digit_decade = (DateTime.Now.Year % 100).ToString()[0].ToString(); - int now_single_digit_year_int = DateTime.Now.Year % 10; - string two_digit_year; - if (single_digit_year < now_single_digit_year_int) { - // next decade - i.e. H0 means March 2020 when the current year is 2017 - string next_decade = (int.Parse(now_single_digit_decade) + 1).ToString(); - two_digit_year = string.Format($"{next_decade}{single_digit_year}"); - } else { - two_digit_year = string.Format($"{now_single_digit_decade}{single_digit_year}"); - } - return $"{_month_abvs[month_index]}{two_digit_year}"; - } - return month_code_and_single_digit_year ?? string.Empty; - } - - public static string GetMonthDifference(string MMMyy1, string MMMyy2) { - var culture = CultureInfo.CreateSpecificCulture("en-US"); - DateTime first_exp = DateTime.ParseExact(MMMyy1, "MMMyy", culture); - DateTime second_exp = DateTime.ParseExact(MMMyy2, "MMMyy", culture); - int num_months = Math.Abs(first_exp.Month - second_exp.Month + 12 * (first_exp.Year - second_exp.Year)); - return num_months.ToString(); - } - - /// - /// Returns the option industry standard month code. - /// - public static string GetMonthCode(int month) { - _check_month(month); - return _month_codes[month - 1]; - } - - /// - /// Returns the standard month abbreviation (Jan, Feb, Mar, etc.). - /// - public static string GetMonthAbv(int month) { - _check_month(month); - return _month_abvs[month - 1]; - } - - public static string SecurityName(this Security security) => - security.ContractCase == Security.ContractOneofCase.Synthetic ? - security.Synthetic.Name : security.Symbol; - - static void _check_month(int month) { - if (month < 1 || month > 12) { - throw new ArgumentException("There are only twelve months in a year", nameof(month)); - } - } - } -} +namespace bts.api { + using System; + using System.Globalization; + using System.Text.RegularExpressions; + + public static class DateFormatter { + static readonly string[] _month_codes = new string[] { + "F", "G", "H", "J", "K", "M", "N", "Q", "U", "V", "X", "Z" + }; + static readonly string[] _month_abvs = new string[] { + "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" + }; + + public static bool TryParse(char c, out DateFormat result) { + switch (c) { + case 's': result = DateFormat.Standard; break; + case 'a': result = DateFormat.MonthAbvDiff2000; break; + case 'c': result = DateFormat.MonthCodeDiff2000; break; + case 'l': result = DateFormat.MonthCodeLastDigitYear; break; + case 'A': result = DateFormat.DayMonthAbvDiff2000; break; + case 'C': result = DateFormat.DayMonthCodeDiff2000; break; + default: + result = DateFormat.Standard; + return false; + } + return true; + } + + /// + /// Returns a concise string representation of a date (using single-letter month codes) + /// appropriate for UIs (e.g. March 22, 2019: 22 Mar 19, or 22 H19). + /// + public static string Format(DateTime date, DateFormat format) => + Format(date.Year, date.Month, date.Day, format); + + /// + /// Returns a concise string representation of a date (using single-letter month codes) + /// appropriate for UIs (e.g. March 22, 2019: 22 Mar 19, or 22 H19). + /// + public static string Format(int year, int month, int day, DateFormat format) => + format switch { + DateFormat.MonthAbvDiff2000 => $"{GetMonthAbv(month)}{year - 2000}", + DateFormat.MonthCodeDiff2000 => $"{GetMonthCode(month)}{year - 2000}", + DateFormat.MonthCodeLastDigitYear => $"{GetMonthCode(month)}{year % 10}", + DateFormat.DayMonthAbvDiff2000 => $"{day}{GetMonthAbv(month)}{year - 2000}", + DateFormat.DayMonthCodeDiff2000 => $"{day}{GetMonthCode(month)}{year - 2000}", + _ => $"{month}/{day}/{year}", + }; + + public static string Format(string month_code_and_single_digit_year) { + string pattern = $"[{string.Concat(_month_codes)}[0-9]"; + if (Regex.Match(month_code_and_single_digit_year, pattern).Success) { + int month_index = Array.IndexOf(_month_codes, month_code_and_single_digit_year[0].ToString()); + int single_digit_year = int.Parse(month_code_and_single_digit_year[1].ToString()); + string now_single_digit_decade = (DateTime.Now.Year % 100).ToString()[0].ToString(); + int now_single_digit_year_int = DateTime.Now.Year % 10; + string two_digit_year; + if (single_digit_year < now_single_digit_year_int) { + // next decade - i.e. H0 means March 2020 when the current year is 2017 + string next_decade = (int.Parse(now_single_digit_decade) + 1).ToString(); + two_digit_year = string.Format($"{next_decade}{single_digit_year}"); + } else { + two_digit_year = string.Format($"{now_single_digit_decade}{single_digit_year}"); + } + return $"{_month_abvs[month_index]}{two_digit_year}"; + } + return month_code_and_single_digit_year ?? string.Empty; + } + + public static string GetMonthDifference(string MMMyy1, string MMMyy2) { + var culture = CultureInfo.CreateSpecificCulture("en-US"); + DateTime first_exp = DateTime.ParseExact(MMMyy1, "MMMyy", culture); + DateTime second_exp = DateTime.ParseExact(MMMyy2, "MMMyy", culture); + int num_months = Math.Abs(first_exp.Month - second_exp.Month + 12 * (first_exp.Year - second_exp.Year)); + return num_months.ToString(); + } + + /// + /// Returns the option industry standard month code. + /// + public static string GetMonthCode(int month) { + _check_month(month); + return _month_codes[month - 1]; + } + + /// + /// Returns the standard month abbreviation (Jan, Feb, Mar, etc.). + /// + public static string GetMonthAbv(int month) { + _check_month(month); + return _month_abvs[month - 1]; + } + + public static string SecurityName(this Security security) => + security.ContractCase == Security.ContractOneofCase.Synthetic ? + security.Synthetic.Name : security.Symbol; + + static void _check_month(int month) { + if (month < 1 || month > 12) { + throw new ArgumentException("There are only twelve months in a year", nameof(month)); + } + } + } +} diff --git a/src/client/spark_api/security/ExchangeSpecificUtilities.cs b/src/cs/Bts.Spark.Api/security/ExchangeSpecificUtilities.cs similarity index 100% rename from src/client/spark_api/security/ExchangeSpecificUtilities.cs rename to src/cs/Bts.Spark.Api/security/ExchangeSpecificUtilities.cs diff --git a/src/client/spark_api/security/GlbxSecurityFormatter.cs b/src/cs/Bts.Spark.Api/security/GlbxSecurityFormatter.cs similarity index 98% rename from src/client/spark_api/security/GlbxSecurityFormatter.cs rename to src/cs/Bts.Spark.Api/security/GlbxSecurityFormatter.cs index 7d5a6fdf5..a4e04b636 100644 --- a/src/client/spark_api/security/GlbxSecurityFormatter.cs +++ b/src/cs/Bts.Spark.Api/security/GlbxSecurityFormatter.cs @@ -1,138 +1,138 @@ -namespace bts.api { - /// - /// https://www.cmegroup.com/confluence/display/EPICSANDBOX/Futures+Spreads - /// - static class GlbxSecurityFormatter { - public static bool format_spread(SecurityImmutable s, out string formatted_spread) { - formatted_spread = string.Empty; - if (!s.HasGlbx) return false; - var colon_split = s.Glbx.SecurityDesc.Split(':'); - string security_sub_type = colon_split[1][..2]; - switch (security_sub_type) { - case "FB": { - // 'GE:FB 02Y H0' - var space_split = colon_split[1].Split(' '); - string num_years = space_split[1][..space_split[1].IndexOf("Y")].TrimStart('0'); - formatted_spread = string.Format("{0} {1} {2}yr {3}", s.Symbol, DateFormatter.Format(space_split[2]), num_years, "Bundle"); - return true; - } - case "BS": { - // 'GE:BS 2YH0 2YH2' - var space_split = colon_split[1].Split(' '); - string num_years = space_split[1][..space_split[1].IndexOf("Y")].TrimStart('0'); - string first = DateFormatter.Format(space_split[1][2..]); - string second = DateFormatter.Format(space_split[2][2..]); - formatted_spread = string.Format("{0} {1} {2}yr {3}", s.Symbol, $"{first} - {second}", num_years, "Bundle Spread"); - return true; - } - case "BF": { - // 'GE:BF Z4-U5-M6' - var space_split = colon_split[1].Split(' '); - var dash_split = space_split[1].Split('-'); - string first = DateFormatter.Format(dash_split[0]); - string second = DateFormatter.Format(dash_split[1]); - string third = DateFormatter.Format(dash_split[2]); - formatted_spread = string.Format("{0} {1} {2}", s.Symbol, $"{first} - {second} - {third}", "Butterfly"); - return true; - } - case "SP": - //return "a Calendar Spread"; - return false; - case "EQ": - //return "an Equity Calendar Spread"; - return false; - case "FX": - //return "an Foreign Exchange Calendar Spread"; - return false; - case "SD": - //return "an SD Calendar Spread"; - return false; - case "CF": { - // 'GE:CF H0H1H2H3' - var space_split = colon_split[1].Split(' '); - string first = space_split[1][..2]; - string date_first = DateFormatter.Format(first); - string second = space_split[1][2..4]; - string date_second = DateFormatter.Format(second); - string diff = DateFormatter.GetMonthDifference(date_first, date_second); - formatted_spread = string.Format("{0} {1} {2}mo {3}", s.Symbol, DateFormatter.Format(first), diff, "Condor"); - return true; - } - case "C1": - //return "a Crack One-One"; - return false; - case "DF": { - // 'GE:DF Z7H8M8U8' - var space_split = colon_split[1].Split(' '); - string first = space_split[1][..2]; - string date_first = DateFormatter.Format(first); - string second = space_split[1][2..4]; - string date_second = DateFormatter.Format(second); - string diff = DateFormatter.GetMonthDifference(date_first, date_second); - formatted_spread = string.Format("{0} {1} {2}mo {3}", s.Symbol, DateFormatter.Format(first), diff, "Double Butterfly"); - return true; - } - case "EC": - //return "a TAS Calendar"; - return false; - case "IS": - //return "an Inter-Commodity"; - return false; - case "MP": { - // 'GE:MP H0 1YM0' - var space_split = colon_split[1].Split(' '); - string first = space_split[1][..2]; - string date_first = DateFormatter.Format(first); - string second = space_split[2][2..4]; - string date_second = DateFormatter.Format(second); - formatted_spread = string.Format("{0} {1}-({2} PK) {3}", s.Symbol, date_first, date_second, "Month Pack"); - return true; - } - case "PK": - // 'GE:PK 01Y H0' - //return "a PK Pack"; - return false; - case "PB": { - // 'GE:PB Z7-Z8-Z9' - var space_split = colon_split[1].Split(' '); - var dash_split = space_split[1].Split('-'); - string first = DateFormatter.Format(dash_split[0]); - string second = DateFormatter.Format(dash_split[1]); - string third = DateFormatter.Format(dash_split[2]); - formatted_spread = string.Format("{0} {1} {2}", s.Symbol, $"{first} - {second} - {third}", "Pack Butterfly"); - return true; - } - case "PS": { - // 'GE:PS H0-H1' - var space_split = colon_split[1].Split(' '); - var dash_split = space_split[1].Split('-'); - string first = DateFormatter.Format(dash_split[0]); - string second = DateFormatter.Format(dash_split[1]); - formatted_spread = string.Format("{0} {1} {2}", s.Symbol, $"{first} - {second}", "Pack Spread"); - return true; - } - case "RT": - // TODO: - // Need SecuritySubType in Security as I believe the lack of :XX in the security - // means different things depending on the security - //return "Reduced Tick Spread"; - case "FS": //return "an FS Strip"; - case "SA": //return "an SA Strip"; - case "SB": //return "an SB Strip"; - case "WS": //return "an Unblanced Strip"; - case "XS": //return "an Energy Inter-Commodity Strip"; - case "DI": //return "an Interest Rate Inter-Commodity Spread"; - case "IV": //return "an Inter-Commodity Spread"; - case "SI": //return "a Commodities Intercommodity Spread"; - case "MS": //return "a BMD Futures Strip"; - case "IN": //return "an Invoice Swap Spread"; - case "SC": //return "an Invoice Swap Calendar Spread"; - case "SW": //return "an Invoice Swap Switch Spread"; - case "TL": //return "a Treasure Tail Spread"; - case "BC": //return "a Henry Hub Intercommodity spread"; - default: - return false; - } - } - } -} +namespace bts.api { + /// + /// https://www.cmegroup.com/confluence/display/EPICSANDBOX/Futures+Spreads + /// + static class GlbxSecurityFormatter { + public static bool format_spread(SecurityImmutable s, out string formatted_spread) { + formatted_spread = string.Empty; + if (!s.HasGlbx) return false; + var colon_split = s.Glbx.SecurityDesc.Split(':'); + string security_sub_type = colon_split[1][..2]; + switch (security_sub_type) { + case "FB": { + // 'GE:FB 02Y H0' + var space_split = colon_split[1].Split(' '); + string num_years = space_split[1][..space_split[1].IndexOf("Y")].TrimStart('0'); + formatted_spread = string.Format("{0} {1} {2}yr {3}", s.Symbol, DateFormatter.Format(space_split[2]), num_years, "Bundle"); + return true; + } + case "BS": { + // 'GE:BS 2YH0 2YH2' + var space_split = colon_split[1].Split(' '); + string num_years = space_split[1][..space_split[1].IndexOf("Y")].TrimStart('0'); + string first = DateFormatter.Format(space_split[1][2..]); + string second = DateFormatter.Format(space_split[2][2..]); + formatted_spread = string.Format("{0} {1} {2}yr {3}", s.Symbol, $"{first} - {second}", num_years, "Bundle Spread"); + return true; + } + case "BF": { + // 'GE:BF Z4-U5-M6' + var space_split = colon_split[1].Split(' '); + var dash_split = space_split[1].Split('-'); + string first = DateFormatter.Format(dash_split[0]); + string second = DateFormatter.Format(dash_split[1]); + string third = DateFormatter.Format(dash_split[2]); + formatted_spread = string.Format("{0} {1} {2}", s.Symbol, $"{first} - {second} - {third}", "Butterfly"); + return true; + } + case "SP": + //return "a Calendar Spread"; + return false; + case "EQ": + //return "an Equity Calendar Spread"; + return false; + case "FX": + //return "an Foreign Exchange Calendar Spread"; + return false; + case "SD": + //return "an SD Calendar Spread"; + return false; + case "CF": { + // 'GE:CF H0H1H2H3' + var space_split = colon_split[1].Split(' '); + string first = space_split[1][..2]; + string date_first = DateFormatter.Format(first); + string second = space_split[1][2..4]; + string date_second = DateFormatter.Format(second); + string diff = DateFormatter.GetMonthDifference(date_first, date_second); + formatted_spread = string.Format("{0} {1} {2}mo {3}", s.Symbol, DateFormatter.Format(first), diff, "Condor"); + return true; + } + case "C1": + //return "a Crack One-One"; + return false; + case "DF": { + // 'GE:DF Z7H8M8U8' + var space_split = colon_split[1].Split(' '); + string first = space_split[1][..2]; + string date_first = DateFormatter.Format(first); + string second = space_split[1][2..4]; + string date_second = DateFormatter.Format(second); + string diff = DateFormatter.GetMonthDifference(date_first, date_second); + formatted_spread = string.Format("{0} {1} {2}mo {3}", s.Symbol, DateFormatter.Format(first), diff, "Double Butterfly"); + return true; + } + case "EC": + //return "a TAS Calendar"; + return false; + case "IS": + //return "an Inter-Commodity"; + return false; + case "MP": { + // 'GE:MP H0 1YM0' + var space_split = colon_split[1].Split(' '); + string first = space_split[1][..2]; + string date_first = DateFormatter.Format(first); + string second = space_split[2][2..4]; + string date_second = DateFormatter.Format(second); + formatted_spread = string.Format("{0} {1}-({2} PK) {3}", s.Symbol, date_first, date_second, "Month Pack"); + return true; + } + case "PK": + // 'GE:PK 01Y H0' + //return "a PK Pack"; + return false; + case "PB": { + // 'GE:PB Z7-Z8-Z9' + var space_split = colon_split[1].Split(' '); + var dash_split = space_split[1].Split('-'); + string first = DateFormatter.Format(dash_split[0]); + string second = DateFormatter.Format(dash_split[1]); + string third = DateFormatter.Format(dash_split[2]); + formatted_spread = string.Format("{0} {1} {2}", s.Symbol, $"{first} - {second} - {third}", "Pack Butterfly"); + return true; + } + case "PS": { + // 'GE:PS H0-H1' + var space_split = colon_split[1].Split(' '); + var dash_split = space_split[1].Split('-'); + string first = DateFormatter.Format(dash_split[0]); + string second = DateFormatter.Format(dash_split[1]); + formatted_spread = string.Format("{0} {1} {2}", s.Symbol, $"{first} - {second}", "Pack Spread"); + return true; + } + case "RT": + // TODO: + // Need SecuritySubType in Security as I believe the lack of :XX in the security + // means different things depending on the security + //return "Reduced Tick Spread"; + case "FS": //return "an FS Strip"; + case "SA": //return "an SA Strip"; + case "SB": //return "an SB Strip"; + case "WS": //return "an Unblanced Strip"; + case "XS": //return "an Energy Inter-Commodity Strip"; + case "DI": //return "an Interest Rate Inter-Commodity Spread"; + case "IV": //return "an Inter-Commodity Spread"; + case "SI": //return "a Commodities Intercommodity Spread"; + case "MS": //return "a BMD Futures Strip"; + case "IN": //return "an Invoice Swap Spread"; + case "SC": //return "an Invoice Swap Calendar Spread"; + case "SW": //return "an Invoice Swap Switch Spread"; + case "TL": //return "a Treasure Tail Spread"; + case "BC": //return "a Henry Hub Intercommodity spread"; + default: + return false; + } + } + } +} diff --git a/src/client/spark_api/security/Security.cs b/src/cs/Bts.Spark.Api/security/Security.cs similarity index 97% rename from src/client/spark_api/security/Security.cs rename to src/cs/Bts.Spark.Api/security/Security.cs index 5efb899b7..a12813e1b 100644 --- a/src/client/spark_api/security/Security.cs +++ b/src/cs/Bts.Spark.Api/security/Security.cs @@ -1,131 +1,131 @@ -using System; -using System.Collections.Generic; - -using static bts.api.Security; - -using security_key = System.UInt32; - -namespace bts.api { - using TickDisplaySettings = domain.TickDisplaySettings; - using TickDisplaySettingsImmutable = domain.TickDisplaySettingsImmutable; - - public partial class Security { - public static security_key key(Security s) { return s.Id; } - - public static bool is_perpetual_exp(DateTime exp) => - exp.Year < 2000 || exp.Year > 2099; - - public static class Defaults { - public static ContractSpecification ContractSpecification => - new() { - CashPerPoint = 1.0, - LowTick = 0.0001, - HighTick = 0.0001, - PriceBreak = double.MaxValue, - PriceMultiplier = 1.0, - MainFraction = 10000 - }; - public static readonly ContractSpecificationImmutable ContractSpecificationImmutable = new(ContractSpecification); - - public static ContractSpecification ContractSpecificationPennies => - new() { - CashPerPoint = 1.0, - LowTick = 0.01, - HighTick = 0.01, - PriceBreak = double.MaxValue, - PriceMultiplier = 1.0, - MainFraction = 100 - }; - public static ContractSpecificationImmutable ContractSpecificationImmutablePennies = - new(ContractSpecificationPennies); - - public static Security Security => - new() { - Symbol = string.Empty, - Exchange = Venue.Bts, - ContractSpec = ContractSpecification - }; - public static readonly SecurityImmutable SecurityImmutable = new(Security); - - public static TickDisplaySettings price_display_settings => new() { - TickFactors = new() { - TickBase = 100, - TickUnit = 1 - }, - DisplayMultiplier = double.NaN, - ShowZeroInteger = true, - ShowDecimalPart = true, - PadWithLeadingZeros = true, - }; - - public static readonly TickDisplaySettingsImmutable price_display_settingsi = - new(price_display_settings); - - public static TickDisplaySettings quantity_display_settings => new() { - TickFactors = new() { - TickBase = 1, - TickUnit = 1 - }, - DisplayMultiplier = double.NaN, - ShowZeroInteger = true, - ShowDecimalPart = false, - PadWithLeadingZeros = true, - }; - - public static readonly TickDisplaySettingsImmutable quantity_display_settingsi = - new(quantity_display_settings); - - public static domain.SecurityMetadata security_metadata => - new() { - PriceDisplay = price_display_settings, - QuantityDisplay = quantity_display_settings - }; - - public static domain.SecurityMetadataImmutable security_metadata_immutable => - new(security_metadata); - } - } - - partial struct SecurityImmutable : IComparable, IComparable, IJsonFormatter { - public int CompareTo(object obj) => - obj is SecurityImmutable ? CompareTo((SecurityImmutable)obj) : -1; - - public int CompareTo(SecurityImmutable other) => - SecurityComparer.compare(this, other); - - partial void ToStringOverride(ref bool didrun, ref string result) { - result = SecurityFormatter.format(this); - didrun = true; - } - public static Object ToJsonObj(SecurityImmutable s) { - return s.Exchange.ToString() + "." + s.ToString(); - } - partial void EqualsOverride(ref bool didrun, ref bool result, SecurityImmutable other) { - didrun = true; - result = Id == other.Id; - } - - /// - /// Traverses the security to get the leaf - /// exchange securities - /// - /// - internal IEnumerable<(security_key, Side, double mult)> get_base_exchange_securities() { - List<(uint, Side, double)> rv = new List<(uint, Side, double)>(); - get_base_exchange_securities(this, Side.Buy, 1.0, ref rv); - return rv; - } - - static void get_base_exchange_securities(SecurityImmutable sec, Side side, double mult, ref List<(security_key, Side, double)> legs) { - Func resolve_side = (s1, s2) => ((s1 == Side.Buy ? 1 : -1) * (s2 == Side.Buy ? 1 : -1)) == 1 ? Side.Buy : Side.Sell; - if (sec.ContractCase == ContractOneofCase.Future) - legs.Add((sec.Id, side, mult)); - else if (sec.ContractCase == ContractOneofCase.Spread) - foreach (ContractLegImmutable leg in sec.Spread.Legs) - get_base_exchange_securities(leg.Security, resolve_side(side, leg.Side), leg.Quantity * mult, ref legs); - else if (sec.ContractCase == ContractOneofCase.Synthetic) - foreach (ContractLegImmutable leg in sec.Synthetic.Legs) - get_base_exchange_securities(leg.Security, resolve_side(side, leg.Side), leg.Quantity * mult, ref legs); - } - } -} +using System; +using System.Collections.Generic; + +using static bts.api.Security; + +using security_key = System.UInt32; + +namespace bts.api { + using TickDisplaySettings = domain.TickDisplaySettings; + using TickDisplaySettingsImmutable = domain.TickDisplaySettingsImmutable; + + public partial class Security { + public static security_key key(Security s) { return s.Id; } + + public static bool is_perpetual_exp(DateTime exp) => + exp.Year < 2000 || exp.Year > 2099; + + public static class Defaults { + public static ContractSpecification ContractSpecification => + new() { + CashPerPoint = 1.0, + LowTick = 0.0001, + HighTick = 0.0001, + PriceBreak = double.MaxValue, + PriceMultiplier = 1.0, + MainFraction = 10000 + }; + public static readonly ContractSpecificationImmutable ContractSpecificationImmutable = new(ContractSpecification); + + public static ContractSpecification ContractSpecificationPennies => + new() { + CashPerPoint = 1.0, + LowTick = 0.01, + HighTick = 0.01, + PriceBreak = double.MaxValue, + PriceMultiplier = 1.0, + MainFraction = 100 + }; + public static ContractSpecificationImmutable ContractSpecificationImmutablePennies = + new(ContractSpecificationPennies); + + public static Security Security => + new() { + Symbol = string.Empty, + Exchange = Venue.Bts, + ContractSpec = ContractSpecification + }; + public static readonly SecurityImmutable SecurityImmutable = new(Security); + + public static TickDisplaySettings price_display_settings => new() { + TickFactors = new() { + TickBase = 100, + TickUnit = 1 + }, + DisplayMultiplier = double.NaN, + ShowZeroInteger = true, + ShowDecimalPart = true, + PadWithLeadingZeros = true, + }; + + public static readonly TickDisplaySettingsImmutable price_display_settingsi = + new(price_display_settings); + + public static TickDisplaySettings quantity_display_settings => new() { + TickFactors = new() { + TickBase = 1, + TickUnit = 1 + }, + DisplayMultiplier = double.NaN, + ShowZeroInteger = true, + ShowDecimalPart = false, + PadWithLeadingZeros = true, + }; + + public static readonly TickDisplaySettingsImmutable quantity_display_settingsi = + new(quantity_display_settings); + + public static domain.SecurityMetadata security_metadata => + new() { + PriceDisplay = price_display_settings, + QuantityDisplay = quantity_display_settings + }; + + public static domain.SecurityMetadataImmutable security_metadata_immutable => + new(security_metadata); + } + } + + partial struct SecurityImmutable : IComparable, IComparable, IJsonFormatter { + public int CompareTo(object obj) => + obj is SecurityImmutable ? CompareTo((SecurityImmutable)obj) : -1; + + public int CompareTo(SecurityImmutable other) => + SecurityComparer.compare(this, other); + + partial void ToStringOverride(ref bool didrun, ref string result) { + result = SecurityFormatter.format(this); + didrun = true; + } + public static Object ToJsonObj(SecurityImmutable s) { + return s.Exchange.ToString() + "." + s.ToString(); + } + partial void EqualsOverride(ref bool didrun, ref bool result, SecurityImmutable other) { + didrun = true; + result = Id == other.Id; + } + + /// + /// Traverses the security to get the leaf + /// exchange securities + /// + /// + internal IEnumerable<(security_key, Side, double mult)> get_base_exchange_securities() { + List<(uint, Side, double)> rv = new List<(uint, Side, double)>(); + get_base_exchange_securities(this, Side.Buy, 1.0, ref rv); + return rv; + } + + static void get_base_exchange_securities(SecurityImmutable sec, Side side, double mult, ref List<(security_key, Side, double)> legs) { + Func resolve_side = (s1, s2) => ((s1 == Side.Buy ? 1 : -1) * (s2 == Side.Buy ? 1 : -1)) == 1 ? Side.Buy : Side.Sell; + if (sec.ContractCase == ContractOneofCase.Future) + legs.Add((sec.Id, side, mult)); + else if (sec.ContractCase == ContractOneofCase.Spread) + foreach (ContractLegImmutable leg in sec.Spread.Legs) + get_base_exchange_securities(leg.Security, resolve_side(side, leg.Side), leg.Quantity * mult, ref legs); + else if (sec.ContractCase == ContractOneofCase.Synthetic) + foreach (ContractLegImmutable leg in sec.Synthetic.Legs) + get_base_exchange_securities(leg.Security, resolve_side(side, leg.Side), leg.Quantity * mult, ref legs); + } + } +} diff --git a/src/client/spark_api/security/SecurityComparer.cs b/src/cs/Bts.Spark.Api/security/SecurityComparer.cs similarity index 100% rename from src/client/spark_api/security/SecurityComparer.cs rename to src/cs/Bts.Spark.Api/security/SecurityComparer.cs diff --git a/src/client/spark_api/security/SecurityEqualityComparer.cs b/src/cs/Bts.Spark.Api/security/SecurityEqualityComparer.cs similarity index 100% rename from src/client/spark_api/security/SecurityEqualityComparer.cs rename to src/cs/Bts.Spark.Api/security/SecurityEqualityComparer.cs diff --git a/src/client/spark_api/security/SecurityExtensions.cs b/src/cs/Bts.Spark.Api/security/SecurityExtensions.cs similarity index 100% rename from src/client/spark_api/security/SecurityExtensions.cs rename to src/cs/Bts.Spark.Api/security/SecurityExtensions.cs diff --git a/src/client/spark_api/security/SecurityFormatter.cs b/src/cs/Bts.Spark.Api/security/SecurityFormatter.cs similarity index 97% rename from src/client/spark_api/security/SecurityFormatter.cs rename to src/cs/Bts.Spark.Api/security/SecurityFormatter.cs index 0b3513170..3479070d0 100644 --- a/src/client/spark_api/security/SecurityFormatter.cs +++ b/src/cs/Bts.Spark.Api/security/SecurityFormatter.cs @@ -1,183 +1,183 @@ -namespace bts.api { - using Spark.Api.Data; - - using System; - using System.Collections.Concurrent; - using System.Collections.Generic; - - public static class SecurityFormatter { - static readonly ConcurrentDictionary _formatted_names_cache = new(); - - public static string format(Security security) => - _formatted_names_cache.GetOrAdd(security.Id, _format(security)); - - public static string format(SecurityImmutable security) => - _formatted_names_cache.GetOrAdd(security.Id, _ => _format(security)); - - public static string format_contract_legs(IEnumerable legs) { - var future_legs = new ContractLegEnumerable(legs, 1); - return string.Join("", _format_legs(future_legs)); - } - - public static string format_future(string symbol, DateTime exp) => - format_future(symbol, (uint)exp.Year, (uint)exp.Month, (uint)exp.Day); - - public static string format_future(string symbol, uint exp_year, uint exp_month, uint exp_day) => - $"{symbol}{format_expiration(new((int)exp_year, (int)exp_month, (int)exp_day))}"; - - public static string format_future(string symbol, FutureContractImmutable future) => - format_future(symbol, future.ExpirationYear, future.ExpirationMonth, future.ExpirationDay); - - public static string format_future(string symbol, string exch_desc, FutureContractImmutable future) => - string.IsNullOrEmpty(exch_desc) ? format_future(symbol, future) : exch_desc; - - public static string format_option(string symbol, uint exp_year, uint exp_month, uint exp_day, double strike, PutOrCall call_put) { - var cp = call_put switch { - PutOrCall.Call => 'C', - PutOrCall.Put => 'P', - _ => '?' - }; - return $"{format_future(symbol, exp_year, exp_month, exp_day)} {strike}{cp}"; - } - - public static string format_option(string symbol, OptionContractImmutable option) => - format_option(symbol, option.ExpirationYear, option.ExpirationMonth, option.ExpirationDay, option.Strike, option.CallPut); - - public static string format_option(string symbol, string exch_desc, OptionContractImmutable option) => - string.IsNullOrEmpty(exch_desc) ? format_option(symbol, option) : exch_desc; - - static string _format(SecurityImmutable? security) => - security.HasValue ? _format(security.Value) : "Unknown-security1"; - - static string _format(SecurityImmutable security, bool exchange_specific_formatting = true) { - switch (security.ContractCase) { - case Security.ContractOneofCase.Future: - if (exchange_specific_formatting && security.HasIce) { - return ExchangeSpecificUtilities.format_security(security); - } - return format_future(security.Symbol, security.security_desc(), security.Future); - case Security.ContractOneofCase.Option: - return format_option(security.Symbol, security.security_desc(), security.Option); - case Security.ContractOneofCase.Spread: - if (exchange_specific_formatting) { - switch (security.ExchangeDataCase) { - case Security.ExchangeDataOneofCase.Glbx: return security.Glbx.SecurityDesc; - case Security.ExchangeDataOneofCase.Ice: return ExchangeSpecificUtilities.format_security(security); - case Security.ExchangeDataOneofCase.Deribit: return security.Deribit.SecurityDesc; - } - } - return string.Join("", _format_legs(new ContractLegEnumerable(security.Spread.Legs, 1))); - case Security.ContractOneofCase.Synthetic: - return security.Synthetic.Name; - case Security.ContractOneofCase.Spot: - return security.security_desc(); - default: - return "Unknown-security2"; - } - } - - /// - /// Returns a shorthand string representation of a security type appropriate for UIs. - /// - public static string format_security_type(SecurityType type) => - format_security_type(type.contract_case()); - - public static string format_security_type(Security.ContractOneofCase type) => - type switch { - Security.ContractOneofCase.Future => "FUT", - Security.ContractOneofCase.Option => "OPT", - Security.ContractOneofCase.Spread => "SPD", - Security.ContractOneofCase.Synthetic => "SYN", - _ => type.ToString(), - }; - - /// - /// Returns a shorthand string representation of a call or put appropriate for UIs (i.e. C or P). - /// - public static string format_call_put(PutOrCall call_put) => - call_put.ToString()[..1]; - -#nullable enable - /// - /// Returns a concise string representation of a security expiration (using symbol-mapped - /// expiration dates, and single-letter month codes) appropriate for UIs (e.g. es March 22, - /// 2019: [Opt] [es] 22 Mar 19, or [Opt] [es] 22 H19). - /// - public static string format_expiration( - DateTime exp_date, - string? symbol = null, - Security.ContractOneofCase? type = null, - DateFormat date_format = DateFormat.DayMonthAbvDiff2000) { - var exp_type = Security.is_perpetual_exp(exp_date) - ? ExpirationDateType.Perpetual - : ExpirationDateType.FixedDate; - var result = new ExpirationDate(exp_date, exp_type).ToString(date_format); - if (symbol is not null) { - result = symbol + " " + result; - } - if (type.HasValue) { - if (result.Length == 0) { - result = format_security_type(type.Value); - } else { - result = $"[{format_security_type(type.Value)}] {result}"; - } - } - return result; - } - - /// - /// Returns a concise string representation of a future trade appropriate for UIs. - /// - public static string format_future_trade( - string symbol, DateTime exp_date, double size, double marginal_price) { - var exp_str = format_expiration(exp_date, symbol: symbol); - return $"{exp_str} {size} lots @ {marginal_price:C}"; - } -#nullable disable - - /// - /// Returns a concise string representation of an option trade appropriate for UIs. - /// - public static string format_option_trade( - string symbol, - DateTime exp_date, - double strike, - bool is_call, - double size, - double marginal_price - ) { - var exp_str = format_expiration(exp_date, symbol: symbol); - var cp_str = is_call ? "C" : "P"; - return $"{exp_str} {strike} {cp_str} {size} lots @ {marginal_price:C}"; - } - - static IEnumerable _format_legs(IEnumerable legs) { - using var en = legs.GetEnumerator(); - if (en.MoveNext()) { - yield return _get_first_leg_name(en.Current); - while (en.MoveNext()) - yield return _get_subsequent_leg_name(en.Current); - } - } - - static string _get_first_leg_name(ContractLegImmutable leg) { - string sec_str = leg.HasSecurity ? - _format(leg.Security, false) : "NoSecurity"; - return leg.signed_quantity() switch { - 1.0 => sec_str, - -1.0 => $"-{sec_str}", - _ => $"{leg.signed_quantity()}{sec_str}", - }; - } - - static string _get_subsequent_leg_name(ContractLegImmutable leg) { - string sec_str = leg.HasSecurity ? - _format(leg.Security, false) : "NoSecurity"; - return leg.signed_quantity() switch { - 1.0 => $"+{sec_str}", - -1.0 => $"-{sec_str}", - _ => $"{leg.signed_quantity():+0.######;-0.######}{sec_str}", - }; - } - } -} +namespace bts.api { + using Spark.Api.Data; + + using System; + using System.Collections.Concurrent; + using System.Collections.Generic; + + public static class SecurityFormatter { + static readonly ConcurrentDictionary _formatted_names_cache = new(); + + public static string format(Security security) => + _formatted_names_cache.GetOrAdd(security.Id, _format(security)); + + public static string format(SecurityImmutable security) => + _formatted_names_cache.GetOrAdd(security.Id, _ => _format(security)); + + public static string format_contract_legs(IEnumerable legs) { + var future_legs = new ContractLegEnumerable(legs, 1); + return string.Join("", _format_legs(future_legs)); + } + + public static string format_future(string symbol, DateTime exp) => + format_future(symbol, (uint)exp.Year, (uint)exp.Month, (uint)exp.Day); + + public static string format_future(string symbol, uint exp_year, uint exp_month, uint exp_day) => + $"{symbol}{format_expiration(new((int)exp_year, (int)exp_month, (int)exp_day))}"; + + public static string format_future(string symbol, FutureContractImmutable future) => + format_future(symbol, future.ExpirationYear, future.ExpirationMonth, future.ExpirationDay); + + public static string format_future(string symbol, string exch_desc, FutureContractImmutable future) => + string.IsNullOrEmpty(exch_desc) ? format_future(symbol, future) : exch_desc; + + public static string format_option(string symbol, uint exp_year, uint exp_month, uint exp_day, double strike, PutOrCall call_put) { + var cp = call_put switch { + PutOrCall.Call => 'C', + PutOrCall.Put => 'P', + _ => '?' + }; + return $"{format_future(symbol, exp_year, exp_month, exp_day)} {strike}{cp}"; + } + + public static string format_option(string symbol, OptionContractImmutable option) => + format_option(symbol, option.ExpirationYear, option.ExpirationMonth, option.ExpirationDay, option.Strike, option.CallPut); + + public static string format_option(string symbol, string exch_desc, OptionContractImmutable option) => + string.IsNullOrEmpty(exch_desc) ? format_option(symbol, option) : exch_desc; + + static string _format(SecurityImmutable? security) => + security.HasValue ? _format(security.Value) : "Unknown-security1"; + + static string _format(SecurityImmutable security, bool exchange_specific_formatting = true) { + switch (security.ContractCase) { + case Security.ContractOneofCase.Future: + if (exchange_specific_formatting && security.HasIce) { + return ExchangeSpecificUtilities.format_security(security); + } + return format_future(security.Symbol, security.security_desc(), security.Future); + case Security.ContractOneofCase.Option: + return format_option(security.Symbol, security.security_desc(), security.Option); + case Security.ContractOneofCase.Spread: + if (exchange_specific_formatting) { + switch (security.ExchangeDataCase) { + case Security.ExchangeDataOneofCase.Glbx: return security.Glbx.SecurityDesc; + case Security.ExchangeDataOneofCase.Ice: return ExchangeSpecificUtilities.format_security(security); + case Security.ExchangeDataOneofCase.Deribit: return security.Deribit.SecurityDesc; + } + } + return string.Join("", _format_legs(new ContractLegEnumerable(security.Spread.Legs, 1))); + case Security.ContractOneofCase.Synthetic: + return security.Synthetic.Name; + case Security.ContractOneofCase.Spot: + return security.security_desc(); + default: + return "Unknown-security2"; + } + } + + /// + /// Returns a shorthand string representation of a security type appropriate for UIs. + /// + public static string format_security_type(SecurityType type) => + format_security_type(type.contract_case()); + + public static string format_security_type(Security.ContractOneofCase type) => + type switch { + Security.ContractOneofCase.Future => "FUT", + Security.ContractOneofCase.Option => "OPT", + Security.ContractOneofCase.Spread => "SPD", + Security.ContractOneofCase.Synthetic => "SYN", + _ => type.ToString(), + }; + + /// + /// Returns a shorthand string representation of a call or put appropriate for UIs (i.e. C or P). + /// + public static string format_call_put(PutOrCall call_put) => + call_put.ToString()[..1]; + +#nullable enable + /// + /// Returns a concise string representation of a security expiration (using symbol-mapped + /// expiration dates, and single-letter month codes) appropriate for UIs (e.g. es March 22, + /// 2019: [Opt] [es] 22 Mar 19, or [Opt] [es] 22 H19). + /// + public static string format_expiration( + DateTime exp_date, + string? symbol = null, + Security.ContractOneofCase? type = null, + DateFormat date_format = DateFormat.DayMonthAbvDiff2000) { + var exp_type = Security.is_perpetual_exp(exp_date) + ? ExpirationDateType.Perpetual + : ExpirationDateType.FixedDate; + var result = new ExpirationDate(exp_date, exp_type).ToString(date_format); + if (symbol is not null) { + result = symbol + " " + result; + } + if (type.HasValue) { + if (result.Length == 0) { + result = format_security_type(type.Value); + } else { + result = $"[{format_security_type(type.Value)}] {result}"; + } + } + return result; + } + + /// + /// Returns a concise string representation of a future trade appropriate for UIs. + /// + public static string format_future_trade( + string symbol, DateTime exp_date, double size, double marginal_price) { + var exp_str = format_expiration(exp_date, symbol: symbol); + return $"{exp_str} {size} lots @ {marginal_price:C}"; + } +#nullable disable + + /// + /// Returns a concise string representation of an option trade appropriate for UIs. + /// + public static string format_option_trade( + string symbol, + DateTime exp_date, + double strike, + bool is_call, + double size, + double marginal_price + ) { + var exp_str = format_expiration(exp_date, symbol: symbol); + var cp_str = is_call ? "C" : "P"; + return $"{exp_str} {strike} {cp_str} {size} lots @ {marginal_price:C}"; + } + + static IEnumerable _format_legs(IEnumerable legs) { + using var en = legs.GetEnumerator(); + if (en.MoveNext()) { + yield return _get_first_leg_name(en.Current); + while (en.MoveNext()) + yield return _get_subsequent_leg_name(en.Current); + } + } + + static string _get_first_leg_name(ContractLegImmutable leg) { + string sec_str = leg.HasSecurity ? + _format(leg.Security, false) : "NoSecurity"; + return leg.signed_quantity() switch { + 1.0 => sec_str, + -1.0 => $"-{sec_str}", + _ => $"{leg.signed_quantity()}{sec_str}", + }; + } + + static string _get_subsequent_leg_name(ContractLegImmutable leg) { + string sec_str = leg.HasSecurity ? + _format(leg.Security, false) : "NoSecurity"; + return leg.signed_quantity() switch { + 1.0 => $"+{sec_str}", + -1.0 => $"-{sec_str}", + _ => $"{leg.signed_quantity():+0.######;-0.######}{sec_str}", + }; + } + } +} diff --git a/src/client/spark_api/threading/SpinLockExtensions.cs b/src/cs/Bts.Spark.Api/threading/SpinLockExtensions.cs similarity index 100% rename from src/client/spark_api/threading/SpinLockExtensions.cs rename to src/cs/Bts.Spark.Api/threading/SpinLockExtensions.cs diff --git a/src/client/spark_api/threading/ThreadSafeEvent.cs b/src/cs/Bts.Spark.Api/threading/ThreadSafeEvent.cs similarity index 100% rename from src/client/spark_api/threading/ThreadSafeEvent.cs rename to src/cs/Bts.Spark.Api/threading/ThreadSafeEvent.cs diff --git a/src/client/spark_api/utils/ProductExtensions.cs b/src/cs/Bts.Spark.Api/utils/ProductExtensions.cs similarity index 96% rename from src/client/spark_api/utils/ProductExtensions.cs rename to src/cs/Bts.Spark.Api/utils/ProductExtensions.cs index 5a854ebff..6ac3d85fe 100644 --- a/src/client/spark_api/utils/ProductExtensions.cs +++ b/src/cs/Bts.Spark.Api/utils/ProductExtensions.cs @@ -1,10 +1,10 @@ -using Google.Protobuf; -namespace bts.api { - - public sealed partial class Product : ICustomDiagnosticMessage { - public string ToDiagnosticString() { - return $"{this.Symbol}:{this.Type}:{this.Exchange}"; - } - } - +using Google.Protobuf; +namespace bts.api { + + public sealed partial class Product : ICustomDiagnosticMessage { + public string ToDiagnosticString() { + return $"{this.Symbol}:{this.Type}:{this.Exchange}"; + } + } + } \ No newline at end of file diff --git a/src/client/spark_api/utils/ProtoHelper.cs b/src/cs/Bts.Spark.Api/utils/ProtoHelper.cs similarity index 100% rename from src/client/spark_api/utils/ProtoHelper.cs rename to src/cs/Bts.Spark.Api/utils/ProtoHelper.cs