From 2871ddf07aef50c65ec7abcf508ac91d1cd9206c Mon Sep 17 00:00:00 2001 From: Viacheslav Demydiuk Date: Fri, 23 Feb 2024 18:10:48 +0200 Subject: [PATCH] MtApi5: Remove redundant classes (requests) --- MtApi5/MtApi5Client.cs | 10 ++++---- MtApi5/MtProtocol/ICustomRequest.cs | 13 +++++++++++ MtApi5/Requests/BuyRequest.cs | 14 ------------ MtApi5/Requests/ChartTimePriceToXyRequest.cs | 16 ------------- MtApi5/Requests/ChartTimePriceToXyResult.cs | 9 -------- MtApi5/Requests/ChartXyToTimePriceRequest.cs | 13 ----------- MtApi5/Requests/ChartXyToTimePriceResult.cs | 14 ------------ MtApi5/Requests/CopyTicksRequest.cs | 12 ---------- MtApi5/Requests/ICustomRequest.cs | 23 ------------------- MtApi5/Requests/IndicatorCreateRequest.cs | 12 ---------- MtApi5/Requests/MarketBookGetRequest.cs | 9 -------- MtApi5/Requests/OrderCheckRequest.cs | 10 -------- MtApi5/Requests/OrderCheckResult.cs | 8 ------- MtApi5/Requests/OrderSendAsyncRequest.cs | 9 -------- MtApi5/Requests/OrderSendRequest.cs | 9 -------- MtApi5/Requests/OrderSendResult.cs | 8 ------- MtApi5/Requests/PositionCloseRequest.cs | 10 -------- MtApi5/Requests/PositionCloseResult.cs | 8 ------- MtApi5/Requests/PositionOpenRequest.cs | 15 ------------ MtApi5/Requests/RequestBase.cs | 7 ------ MtApi5/Requests/RequestType.cs | 24 -------------------- MtApi5/Requests/SellRequest.cs | 14 ------------ MtApi5/Requests/SymbolInfoStringRequest.cs | 10 -------- MtApi5/Requests/SymbolInfoStringResult.cs | 8 ------- MtApi5/Requests/SymbolInfoTickRequest.cs | 9 -------- 25 files changed, 18 insertions(+), 276 deletions(-) create mode 100755 MtApi5/MtProtocol/ICustomRequest.cs delete mode 100644 MtApi5/Requests/BuyRequest.cs delete mode 100644 MtApi5/Requests/ChartTimePriceToXyRequest.cs delete mode 100644 MtApi5/Requests/ChartTimePriceToXyResult.cs delete mode 100644 MtApi5/Requests/ChartXyToTimePriceRequest.cs delete mode 100644 MtApi5/Requests/ChartXyToTimePriceResult.cs delete mode 100755 MtApi5/Requests/CopyTicksRequest.cs delete mode 100644 MtApi5/Requests/ICustomRequest.cs delete mode 100644 MtApi5/Requests/IndicatorCreateRequest.cs delete mode 100644 MtApi5/Requests/MarketBookGetRequest.cs delete mode 100644 MtApi5/Requests/OrderCheckRequest.cs delete mode 100644 MtApi5/Requests/OrderCheckResult.cs delete mode 100644 MtApi5/Requests/OrderSendAsyncRequest.cs delete mode 100644 MtApi5/Requests/OrderSendRequest.cs delete mode 100644 MtApi5/Requests/OrderSendResult.cs delete mode 100644 MtApi5/Requests/PositionCloseRequest.cs delete mode 100644 MtApi5/Requests/PositionCloseResult.cs delete mode 100644 MtApi5/Requests/PositionOpenRequest.cs delete mode 100755 MtApi5/Requests/RequestBase.cs delete mode 100755 MtApi5/Requests/RequestType.cs delete mode 100644 MtApi5/Requests/SellRequest.cs delete mode 100644 MtApi5/Requests/SymbolInfoStringRequest.cs delete mode 100644 MtApi5/Requests/SymbolInfoStringResult.cs delete mode 100644 MtApi5/Requests/SymbolInfoTickRequest.cs diff --git a/MtApi5/MtApi5Client.cs b/MtApi5/MtApi5Client.cs index cdba039e..53ddaffc 100755 --- a/MtApi5/MtApi5Client.cs +++ b/MtApi5/MtApi5Client.cs @@ -1,8 +1,8 @@ using System.Collections; -using MtApi5.Requests; using Newtonsoft.Json; using MtClient; using MtApi5.MtProtocol; +using MtApi5.MtProtocol.ICustomRequest; namespace MtApi5 { @@ -2965,7 +2965,7 @@ namespace MtApi5 { Dictionary cmdParams = new() { { "Symbol", symbol }, { "Period", (int)period }, { "Name", name }, { "Parameters", parameters }, - { "ParamsType", ICustomRequest.ParametersType.Double} }; + { "ParamsType", ParametersType.Double} }; return SendCommand(ExecutorHandle, Mt5CommandType.iCustom, cmdParams); } @@ -2980,7 +2980,7 @@ namespace MtApi5 { Dictionary cmdParams = new() { { "Symbol", symbol }, { "Period", (int)period }, { "Name", name }, { "Parameters", parameters }, - { "ParamsType", ICustomRequest.ParametersType.Int } }; + { "ParamsType", ParametersType.Int } }; return SendCommand(ExecutorHandle, Mt5CommandType.iCustom, cmdParams); } @@ -2995,7 +2995,7 @@ namespace MtApi5 { Dictionary cmdParams = new() { { "Symbol", symbol }, { "Period", (int)period }, { "Name", name }, { "Parameters", parameters }, - { "ParamsType", ICustomRequest.ParametersType.String } }; + { "ParamsType", ParametersType.String } }; return SendCommand(ExecutorHandle, Mt5CommandType.iCustom, cmdParams); } @@ -3010,7 +3010,7 @@ namespace MtApi5 { Dictionary cmdParams = new() { { "Symbol", symbol }, { "Period", (int)period }, { "Name", name }, { "Parameters", parameters }, - { "ParamsType", ICustomRequest.ParametersType.Boolean } }; + { "ParamsType", ParametersType.Boolean } }; return SendCommand(ExecutorHandle, Mt5CommandType.iCustom, cmdParams); } diff --git a/MtApi5/MtProtocol/ICustomRequest.cs b/MtApi5/MtProtocol/ICustomRequest.cs new file mode 100755 index 00000000..dccd71e8 --- /dev/null +++ b/MtApi5/MtProtocol/ICustomRequest.cs @@ -0,0 +1,13 @@ +namespace MtApi5.MtProtocol +{ + namespace ICustomRequest + { + public enum ParametersType + { + Int = 0, + Double = 1, + String = 2, + Boolean = 3 + } + } +} diff --git a/MtApi5/Requests/BuyRequest.cs b/MtApi5/Requests/BuyRequest.cs deleted file mode 100644 index ae7cc951..00000000 --- a/MtApi5/Requests/BuyRequest.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace MtApi5.Requests -{ - internal class BuyRequest : RequestBase - { - public override RequestType RequestType => RequestType.Buy; - - public double Volume { get; set; } - public string? Symbol { get; set; } - public double Price { get; set; } - public double Sl { get; set; } - public double Tp { get; set; } - public string? Comment { get; set; } - } -} diff --git a/MtApi5/Requests/ChartTimePriceToXyRequest.cs b/MtApi5/Requests/ChartTimePriceToXyRequest.cs deleted file mode 100644 index 7287a2e5..00000000 --- a/MtApi5/Requests/ChartTimePriceToXyRequest.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; - -namespace MtApi5.Requests -{ - internal class ChartTimePriceToXyRequest : RequestBase - { - public override RequestType RequestType => RequestType.ChartTimePriceToXY; - - public long ChartId { get; set; } - public int SubWindow { get; set; } - public DateTime? Time { get; set; } - public double Price { get; set; } - - public int MtTime => Mt5TimeConverter.ConvertToMtTime(Time); - } -} \ No newline at end of file diff --git a/MtApi5/Requests/ChartTimePriceToXyResult.cs b/MtApi5/Requests/ChartTimePriceToXyResult.cs deleted file mode 100644 index 4c74ee20..00000000 --- a/MtApi5/Requests/ChartTimePriceToXyResult.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MtApi5.Requests -{ - internal class ChartTimePriceToXyResult - { - public bool RetVal { get; set; } - public int X { get; set; } - public int Y { get; set; } - } -} \ No newline at end of file diff --git a/MtApi5/Requests/ChartXyToTimePriceRequest.cs b/MtApi5/Requests/ChartXyToTimePriceRequest.cs deleted file mode 100644 index 871f6aae..00000000 --- a/MtApi5/Requests/ChartXyToTimePriceRequest.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; - -namespace MtApi5.Requests -{ - internal class ChartXyToTimePriceRequest : RequestBase - { - public override RequestType RequestType => RequestType.ChartXYToTimePrice; - - public long ChartId { get; set; } - public int X { get; set; } - public int Y { get; set; } - } -} \ No newline at end of file diff --git a/MtApi5/Requests/ChartXyToTimePriceResult.cs b/MtApi5/Requests/ChartXyToTimePriceResult.cs deleted file mode 100644 index dfd3f1d4..00000000 --- a/MtApi5/Requests/ChartXyToTimePriceResult.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; - -namespace MtApi5.Requests -{ - internal class ChartXyToTimePriceResult - { - public bool RetVal { get; set; } - public int SubWindow { get; set; } - public DateTime? Time => Mt5TimeConverter.ConvertFromMtTime(MtTime); - public double Price { get; set; } - - public int MtTime { get; set; } - } -} \ No newline at end of file diff --git a/MtApi5/Requests/CopyTicksRequest.cs b/MtApi5/Requests/CopyTicksRequest.cs deleted file mode 100755 index 11cefaf4..00000000 --- a/MtApi5/Requests/CopyTicksRequest.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace MtApi5.Requests -{ - internal class CopyTicksRequest: RequestBase - { - public override RequestType RequestType => RequestType.CopyTicks; - - public string? SymbolName { get; set; } - public int Flags { get; set; } - public ulong From { get; set; } - public uint Count { get; set; } - } -} \ No newline at end of file diff --git a/MtApi5/Requests/ICustomRequest.cs b/MtApi5/Requests/ICustomRequest.cs deleted file mode 100644 index 0cbeb064..00000000 --- a/MtApi5/Requests/ICustomRequest.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; - -namespace MtApi5.Requests -{ - internal class ICustomRequest : RequestBase - { - public enum ParametersType - { - Int = 0, - Double = 1, - String = 2, - Boolean = 3 - } - - public required string Symbol { get; set; } - public int Timeframe { get; set; } - public string? Name { get; set; } - public ArrayList? Params { get; set; } - public ParametersType ParamsType { get; set; } - - public override RequestType RequestType => RequestType.iCustom; - } -} diff --git a/MtApi5/Requests/IndicatorCreateRequest.cs b/MtApi5/Requests/IndicatorCreateRequest.cs deleted file mode 100644 index 63f4f05c..00000000 --- a/MtApi5/Requests/IndicatorCreateRequest.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace MtApi5.Requests -{ - internal class IndicatorCreateRequest: RequestBase - { - public override RequestType RequestType => RequestType.IndicatorCreate; - - public string? Symbol { get; set; } - public ENUM_TIMEFRAMES Period { get; set; } - public ENUM_INDICATOR IndicatorType { get; set; } - public List? Parameters { get; set; } - } -} \ No newline at end of file diff --git a/MtApi5/Requests/MarketBookGetRequest.cs b/MtApi5/Requests/MarketBookGetRequest.cs deleted file mode 100644 index 0c01c3e2..00000000 --- a/MtApi5/Requests/MarketBookGetRequest.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MtApi5.Requests -{ - internal class MarketBookGetRequest: RequestBase - { - public override RequestType RequestType => RequestType.MarketBookGet; - - public string? Symbol { get; set; } - } -} \ No newline at end of file diff --git a/MtApi5/Requests/OrderCheckRequest.cs b/MtApi5/Requests/OrderCheckRequest.cs deleted file mode 100644 index ed9ad1ea..00000000 --- a/MtApi5/Requests/OrderCheckRequest.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace MtApi5.Requests -{ - internal class OrderCheckRequest: RequestBase - { - public override RequestType RequestType => RequestType.OrderCheck; - - public MqlTradeRequest? TradeRequest { get; set; } - - } -} \ No newline at end of file diff --git a/MtApi5/Requests/OrderCheckResult.cs b/MtApi5/Requests/OrderCheckResult.cs deleted file mode 100644 index 9c98ff1c..00000000 --- a/MtApi5/Requests/OrderCheckResult.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace MtApi5.Requests -{ - public class OrderCheckResult - { - public bool RetVal { get; set; } - public MqlTradeCheckResult? TradeCheckResult { get; set; } - } -} \ No newline at end of file diff --git a/MtApi5/Requests/OrderSendAsyncRequest.cs b/MtApi5/Requests/OrderSendAsyncRequest.cs deleted file mode 100644 index 1330d420..00000000 --- a/MtApi5/Requests/OrderSendAsyncRequest.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MtApi5.Requests -{ - internal class OrderSendAsyncRequest : RequestBase - { - public override RequestType RequestType => RequestType.OrderSendAsync; - - public MqlTradeRequest? TradeRequest { get; set; } - } -} \ No newline at end of file diff --git a/MtApi5/Requests/OrderSendRequest.cs b/MtApi5/Requests/OrderSendRequest.cs deleted file mode 100644 index 7257d22b..00000000 --- a/MtApi5/Requests/OrderSendRequest.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MtApi5.Requests -{ - internal class OrderSendRequest: RequestBase - { - public override RequestType RequestType => RequestType.OrderSend; - - public MqlTradeRequest? TradeRequest { get; set; } - } -} diff --git a/MtApi5/Requests/OrderSendResult.cs b/MtApi5/Requests/OrderSendResult.cs deleted file mode 100644 index 827b2bde..00000000 --- a/MtApi5/Requests/OrderSendResult.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace MtApi5.Requests -{ - internal class OrderSendResult - { - public bool RetVal { get; set; } - public MqlTradeResult? TradeResult { get; set; } - } -} \ No newline at end of file diff --git a/MtApi5/Requests/PositionCloseRequest.cs b/MtApi5/Requests/PositionCloseRequest.cs deleted file mode 100644 index 3695397c..00000000 --- a/MtApi5/Requests/PositionCloseRequest.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace MtApi5.Requests -{ - internal class PositionCloseRequest : RequestBase - { - public override RequestType RequestType => RequestType.PositionClose; - - public ulong Ticket { get; set; } - public ulong Deviation { get; set; } - } -} \ No newline at end of file diff --git a/MtApi5/Requests/PositionCloseResult.cs b/MtApi5/Requests/PositionCloseResult.cs deleted file mode 100644 index d290f625..00000000 --- a/MtApi5/Requests/PositionCloseResult.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace MtApi5.Requests -{ - internal class PositionCloseResult - { - public bool RetVal { get; set; } - public MqlTradeResult? TradeResult { get; set; } - } -} \ No newline at end of file diff --git a/MtApi5/Requests/PositionOpenRequest.cs b/MtApi5/Requests/PositionOpenRequest.cs deleted file mode 100644 index 8478d236..00000000 --- a/MtApi5/Requests/PositionOpenRequest.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace MtApi5.Requests -{ - internal class PositionOpenRequest: RequestBase - { - public override RequestType RequestType => RequestType.PositionOpen; - - public string? Symbol { get; set; } - public ENUM_ORDER_TYPE OrderType { get; set; } - public double Volume { get; set; } - public double Price { get; set; } - public double Sl { get; set; } - public double Tp { get; set; } - public string? Comment { get; set; } - } -} \ No newline at end of file diff --git a/MtApi5/Requests/RequestBase.cs b/MtApi5/Requests/RequestBase.cs deleted file mode 100755 index e0467da2..00000000 --- a/MtApi5/Requests/RequestBase.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace MtApi5.Requests -{ - internal abstract class RequestBase - { - public abstract RequestType RequestType { get; } - } -} diff --git a/MtApi5/Requests/RequestType.cs b/MtApi5/Requests/RequestType.cs deleted file mode 100755 index 44acac1f..00000000 --- a/MtApi5/Requests/RequestType.cs +++ /dev/null @@ -1,24 +0,0 @@ -// ReSharper disable InconsistentNaming - -namespace MtApi5.Requests -{ - internal enum RequestType - { - Unknown = 0, - CopyTicks = 1, - iCustom = 2, - OrderSend = 3, - PositionOpen = 4, - OrderCheck = 5, - MarketBookGet = 6, - IndicatorCreate = 7, - SymbolInfoString = 8, - ChartTimePriceToXY = 9, - ChartXYToTimePrice = 10, - PositionClose = 11, - SymbolInfoTick = 12, - Buy = 13, - Sell = 14, - OrderSendAsync = 15 - } -} \ No newline at end of file diff --git a/MtApi5/Requests/SellRequest.cs b/MtApi5/Requests/SellRequest.cs deleted file mode 100644 index ed797625..00000000 --- a/MtApi5/Requests/SellRequest.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace MtApi5.Requests -{ - internal class SellRequest : RequestBase - { - public override RequestType RequestType => RequestType.Sell; - - public double Volume { get; set; } - public string? Symbol { get; set; } - public double Price { get; set; } - public double Sl { get; set; } - public double Tp { get; set; } - public string? Comment { get; set; } - } -} diff --git a/MtApi5/Requests/SymbolInfoStringRequest.cs b/MtApi5/Requests/SymbolInfoStringRequest.cs deleted file mode 100644 index 662a52c3..00000000 --- a/MtApi5/Requests/SymbolInfoStringRequest.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace MtApi5.Requests -{ - internal class SymbolInfoStringRequest : RequestBase - { - public override RequestType RequestType => RequestType.SymbolInfoString; - - public string? SymbolName { get; set; } - public ENUM_SYMBOL_INFO_STRING PropId { get; set; } - } -} \ No newline at end of file diff --git a/MtApi5/Requests/SymbolInfoStringResult.cs b/MtApi5/Requests/SymbolInfoStringResult.cs deleted file mode 100644 index de957e36..00000000 --- a/MtApi5/Requests/SymbolInfoStringResult.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace MtApi5.Requests -{ - internal class SymbolInfoStringResult - { - public bool RetVal { get; set; } - public string? StringVar { get; set; } - } -} \ No newline at end of file diff --git a/MtApi5/Requests/SymbolInfoTickRequest.cs b/MtApi5/Requests/SymbolInfoTickRequest.cs deleted file mode 100644 index f788e6cf..00000000 --- a/MtApi5/Requests/SymbolInfoTickRequest.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MtApi5.Requests -{ - internal class SymbolInfoTickRequest : RequestBase - { - public override RequestType RequestType => RequestType.SymbolInfoTick; - - public string? SymbolName { get; set; } - } -}