Minor refactoring to remote redundant code

This commit is contained in:
vdemydiuk
2018-02-19 17:12:26 +02:00
parent f1c1df1e00
commit 83776f8b7a
2 changed files with 13 additions and 51 deletions
+12 -8
View File
@@ -81,7 +81,7 @@ namespace MtApi5
{
var client = Client;
var quotes = client?.GetQuotes();
return quotes?.Select(q => q.Parse());
return quotes?.Select(q => q.Convert());
}
///<summary>
@@ -2490,11 +2490,9 @@ namespace MtApi5
private void _client_QuoteUpdated(MtQuote quote)
{
if (quote != null)
{
QuoteUpdate?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote.Instrument, quote.Bid, quote.Ask)));
QuoteUpdated?.Invoke(this, quote.Instrument, quote.Bid, quote.Ask);
}
if (quote == null) return;
QuoteUpdate?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote.Instrument, quote.Bid, quote.Ask)));
QuoteUpdated?.Invoke(this, quote.Instrument, quote.Bid, quote.Ask);
}
private void _client_ServerDisconnected(object sender, EventArgs e)
@@ -2509,12 +2507,18 @@ namespace MtApi5
private void _client_QuoteRemoved(MtQuote quote)
{
QuoteRemoved?.Invoke(this, new Mt5QuoteEventArgs(quote.Parse()));
if (quote != null)
{
QuoteRemoved?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote.Instrument, quote.Bid, quote.Ask)));
}
}
private void _client_QuoteAdded(MtQuote quote)
{
QuoteAdded?.Invoke(this, new Mt5QuoteEventArgs(quote.Parse()));
if (quote != null)
{
QuoteAdded?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote.Instrument, quote.Bid, quote.Ask)));
}
}
private void OnConnected()