fixed some things

Author: Rick-29

crates/binary_options_tools/src/pocketoption/types/callback.rs

@@ -6,8 +6,7 @@ use tokio::time::sleep;
 use tracing::{debug, info, instrument};
 
 use crate::pocketoption::{
-    error::PocketOptionError, parser::message::WebSocketMessage, types::info::MessageInfo,
-    validators::history_validator,
+    parser::message::WebSocketMessage, types::info::MessageInfo,
 };
 use binary_options_tools_core::{
     error::{BinaryOptionsResult, BinaryOptionsToolsError},
@@ -23,29 +22,14 @@ impl PocketCallback {
     async fn update_assets(
         data: &Data<PocketData, WebSocketMessage>,
         sender: &SenderMessage,
-        config: &Config<PocketData, WebSocketMessage, ()>,
     ) -> BinaryOptionsResult<()> {
         for asset in data.stream_assets().await {
+            // Send 3 messages, 1: change symbol, 2: unsubscribe symbol, 3: subscribe symbol
+            debug!("Updating asset: {asset}");
+            sender.send(WebSocketMessage::ChangeSymbol(ChangeSymbol::new(asset.to_string(), 1))).await?;
+            sender.send(WebSocketMessage::Unsubfor(asset.to_string())).await?;
+            sender.send(WebSocketMessage::Subfor(asset.to_string())).await?;
             sleep(Duration::from_secs(1)).await;
-            let history = ChangeSymbol::new(asset.to_string(), 3600);
-            let res = sender
-                .send_message_with_timout(
-                    config.get_timeout()?,
-                    "SubscribeSymbolCallback",
-                    data,
-                    WebSocketMessage::ChangeSymbol(history),
-                    MessageInfo::UpdateHistoryNewFast,
-                    &history_validator(asset.to_string(), 3600),
-                )
-                .await?;
-            if let WebSocketMessage::UpdateHistoryNewFast(_) = res {
-                debug!("Sent 'ChangeSymbol' for asset: {asset}");
-            } else {
-                return Err(PocketOptionError::UnexpectedIncorrectWebSocketMessage(
-                    res.information(),
-                )
-                .into());
-            }
         }
         Ok(())
     }
@@ -75,15 +59,15 @@ impl WCallback for PocketCallback {
     type Transfer = WebSocketMessage;
     type U = ();
 
-    #[instrument(skip(self, data, sender, config))]
+    #[instrument(skip(self, data, sender, _config))]
     async fn call(
         &self,
         data: Data<Self::T, Self::Transfer>,
         sender: &SenderMessage,
-        config: &Config<Self::T, Self::Transfer, Self::U>,
+        _config: &Config<Self::T, Self::Transfer, Self::U>,
     ) -> BinaryOptionsResult<()> {
         // let sender = sender.clone();
-        let update_assets_future = Self::update_assets(&data, sender, config);
+        let update_assets_future = Self::update_assets(&data, sender);
         let update_check_results_future = Self::update_check_results(&data);
         try_join(update_assets_future, update_check_results_future).await?;
         Ok(())

crates/binary_options_tools/src/pocketoption/validators.rs

@@ -45,7 +45,7 @@ pub fn history_validator(
     period: i64,
 ) -> impl Fn(&WebSocketMessage) -> bool + Send + Sync {
     move |message| {
-        if let WebSocketMessage::UpdateHistoryNewFast(history) = message {
+        if let WebSocketMessage::UpdateHistoryNewFast(history) | WebSocketMessage::UpdateHistoryNew(history) = message {
             if history.asset == asset && history.period == period {
                 return true;
             }