Merge pull request #5 from Boku-Labs/skip_check_for_sequence_reset

Remove config and just skip verififcation for reset messages

Author: Vlad-Bukatin

crates/hotfix/CHANGELOG.md

@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
- - possibility to disalbe original sending time(tag 122) for admin messages ([#322](https://github.com/Validus-Risk-Management/hotfix/pull/334))
+ - skip check for original sending time(tag 122) in sequence reset messages ([#322](https://github.com/Validus-Risk-Management/hotfix/pull/334))
 
 ## [0.11.0](https://github.com/Validus-Risk-Management/hotfix/compare/hotfix-v0.10.0...hotfix-v0.11.0) - 2026-03-25
 

crates/hotfix/src/config.rs

@@ -114,63 +114,6 @@ pub struct SessionConfig {
 
     /// The schedule configuration for the session
     pub schedule: Option<ScheduleConfig>,
-
-    /// The validation configuration for the session
-    #[serde(default)]
-    pub verification: VerificationConfig,
-}
-
-#[derive(Clone, Debug, Deserialize)]
-/// The configuration of validation rules.
-pub struct VerificationConfig {
-    /// Specifies whether we should check the original sending time for admin messages.
-    #[serde(default = "default_true")]
-    pub check_orig_sending_time_for_admin: bool,
-}
-
-impl VerificationConfig {
-    pub fn builder() -> VerificationConfigBuilder {
-        VerificationConfigBuilder::default()
-    }
-}
-
-impl Default for VerificationConfig {
-    fn default() -> Self {
-        VerificationConfigBuilder::default().build()
-    }
-}
-
-pub struct VerificationConfigBuilder {
-    check_orig_sending_time_for_admin: bool,
-}
-
-impl Default for VerificationConfigBuilder {
-    fn default() -> Self {
-        Self {
-            check_orig_sending_time_for_admin: true,
-        }
-    }
-}
-
-impl VerificationConfigBuilder {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    pub fn check_orig_sending_time_for_admin(mut self, value: bool) -> Self {
-        self.check_orig_sending_time_for_admin = value;
-        self
-    }
-
-    pub fn build(self) -> VerificationConfig {
-        VerificationConfig {
-            check_orig_sending_time_for_admin: self.check_orig_sending_time_for_admin,
-        }
-    }
-}
-
-fn default_true() -> bool {
-    true
 }
 
 /// Errors that may occur when loading configuration.
@@ -227,11 +170,6 @@ reset_on_logon = false
         assert_eq!(session_config.tls_config, Some(expected_tls_config));
         assert_eq!(session_config.reconnect_interval, 30);
         assert_eq!(session_config.logon_timeout, 10);
-        assert!(
-            session_config
-                .verification
-                .check_orig_sending_time_for_admin
-        );
     }
 
     #[test]
@@ -501,53 +439,6 @@ end_day = "Friday"
         assert_eq!(session_config.reconnect_interval, 15);
     }
 
-    #[test]
-    fn test_verification_config_defaults_when_omitted() {
-        let config_contents = r#"
-[[sessions]]
-begin_string = "FIX.4.4"
-sender_comp_id = "send-comp-id"
-target_comp_id = "target-comp-id"
-connection_port = 443
-connection_host = "127.0.0.1"
-heartbeat_interval = 30
-        "#;
-
-        let config: Config = toml::from_str(config_contents).unwrap();
-        let session_config = config.sessions.first().unwrap();
-
-        assert!(
-            session_config
-                .verification
-                .check_orig_sending_time_for_admin
-        );
-    }
-
-    #[test]
-    fn test_verification_config_can_disable_admin_orig_sending_time_check() {
-        let config_contents = r#"
-[[sessions]]
-begin_string = "FIX.4.4"
-sender_comp_id = "send-comp-id"
-target_comp_id = "target-comp-id"
-connection_port = 443
-connection_host = "127.0.0.1"
-heartbeat_interval = 30
-
-[sessions.verification]
-check_orig_sending_time_for_admin = false
-        "#;
-
-        let config: Config = toml::from_str(config_contents).unwrap();
-        let session_config = config.sessions.first().unwrap();
-
-        assert!(
-            !session_config
-                .verification
-                .check_orig_sending_time_for_admin
-        );
-    }
-
     #[test]
     fn test_load_from_path_success() {
         let config_contents = r#"

crates/hotfix/src/initiator.rs

@@ -157,7 +157,6 @@ async fn establish_connection<Outbound: OutboundMessage>(
 mod tests {
     use super::*;
     use crate::application::{Application, InboundDecision, OutboundDecision};
-    use crate::config::VerificationConfig;
     use crate::message::generate_message;
     use crate::message::logon::{Logon, ResetSeqNumConfig};
     use crate::message::logout::Logout;
@@ -300,7 +299,6 @@ mod tests {
             reconnect_interval: 1, // Short for tests
             reset_on_logon: false,
             schedule: None,
-            verification: VerificationConfig::default(),
         }
     }
 

crates/hotfix/src/message/verification.rs

@@ -1,9 +1,9 @@
-use crate::config::{SessionConfig, VerificationConfig};
+use crate::config::SessionConfig;
+use crate::message::ResendRequest;
 use crate::message::logout::Logout;
 use crate::message::reject::Reject;
 use crate::message::sequence_reset::SequenceReset;
 use crate::message::verification_issue::{CompIdType, MessageError, VerificationIssue};
-use crate::message::{ResendRequest, is_admin};
 use crate::session::error::SessionOperationError;
 use hotfix_message::Part;
 use hotfix_message::field_types::Timestamp;
@@ -22,7 +22,6 @@ const SENDING_TIME_THRESHOLD: u64 = 120;
 pub(crate) struct VerificationFlags {
     pub(crate) check_too_high: bool,
     pub(crate) check_too_low: bool,
-    #[allow(dead_code)]
     pub(crate) check_orig_sending_time: bool,
 }
 
@@ -43,36 +42,28 @@ impl VerificationFlags {
         self.check_too_high || self.check_too_low
     }
 
-    pub(crate) fn for_message(
-        message: &Message,
-        user_config: &VerificationConfig,
-    ) -> Result<Self, SessionOperationError> {
+    pub(crate) fn for_message(message: &Message) -> Result<Self, SessionOperationError> {
         let message_type: &str = message
             .header()
             .get(MSG_TYPE)
             .map_err(|_| SessionOperationError::MissingField("MSG_TYPE"))?;
 
         let possible_duplicate = message.header().get::<bool>(POSS_DUP_FLAG).unwrap_or(false);
-        let check_orig_sending_time = if is_admin(message_type) {
-            possible_duplicate && user_config.check_orig_sending_time_for_admin
-        } else {
-            possible_duplicate
-        };
 
         let flags = match message_type {
             // check_too_high=false: QFJ-673 deadlock fix. When both sides send
             // ResendRequest simultaneously, each side's ResendRequest will have a seq
             // number higher than expected. By not treating that as an error, we allow
             // the ResendRequest to be processed.
             ResendRequest::MSG_TYPE | Reject::MSG_TYPE => {
-                Self::new(false, true, check_orig_sending_time)
+                Self::new(false, true, possible_duplicate)
             }
-            Logout::MSG_TYPE => Self::new(false, false, check_orig_sending_time),
+            Logout::MSG_TYPE => Self::new(false, false, possible_duplicate),
             SequenceReset::MSG_TYPE => {
                 let is_gap_fill: bool = message.get(GAP_FILL_FLAG).unwrap_or(false);
-                Self::new(is_gap_fill, is_gap_fill, check_orig_sending_time)
+                Self::new(is_gap_fill, is_gap_fill, false)
             }
-            _ => Self::new(true, true, check_orig_sending_time),
+            _ => Self::new(true, true, possible_duplicate),
         };
 
         Ok(flags)
@@ -246,8 +237,8 @@ fn check_target_comp_id(
 
 #[cfg(test)]
 mod tests {
-    use super::{Message, SessionConfig, VerificationConfig, VerificationFlags, verify_message};
-    use crate::message::heartbeat::Heartbeat;
+    use super::{Message, SessionConfig, VerificationFlags, verify_message};
+    use crate::message::sequence_reset::SequenceReset;
     use crate::message::verification_issue::{CompIdType, MessageError, VerificationIssue};
     use hotfix_message::field_types::Timestamp;
     use hotfix_message::{Part, fix44};
@@ -267,7 +258,6 @@ mod tests {
             reconnect_interval: 0,
             reset_on_logon: false,
             schedule: None,
-            verification: VerificationConfig::default(),
         }
     }
 
@@ -296,62 +286,47 @@ mod tests {
     }
 
     #[test]
-    fn test_creating_flags_for_admin_message_should_check_orig_sending_time_when_enabled() {
-        let mut msg =
-            build_test_message_with_type("FIX.4.4", Heartbeat::MSG_TYPE, "TARGET", "SENDER", 42);
-        msg.header_mut().set(fix44::POSS_DUP_FLAG, true);
-
-        let flags = VerificationFlags::for_message(&msg, &VerificationConfig::default()).unwrap();
-
-        assert!(flags.check_orig_sending_time);
-        assert!(flags.check_too_high);
-        assert!(flags.check_too_low);
-    }
-
-    #[test]
-    fn test_creating_flags_for_admin_message_should_skip_check_orig_sending_time_when_not_poss_dup()
-    {
-        let msg =
-            build_test_message_with_type("FIX.4.4", Heartbeat::MSG_TYPE, "TARGET", "SENDER", 42);
+    fn test_creating_flags_for_gap_fill_message_should_skip_check_orig_sending_time() {
+        let msg = build_test_message_with_type(
+            "FIX.4.4",
+            SequenceReset::MSG_TYPE,
+            "TARGET",
+            "SENDER",
+            42,
+        );
 
-        let flags = VerificationFlags::for_message(&msg, &VerificationConfig::default()).unwrap();
+        let flags = VerificationFlags::for_message(&msg).unwrap();
 
         assert!(!flags.check_orig_sending_time);
-        assert!(flags.check_too_high);
-        assert!(flags.check_too_low);
+        assert!(!flags.check_too_high);
+        assert!(!flags.check_too_low);
     }
 
     #[test]
-    fn test_creating_flags_for_admin_message_should_skip_check_orig_sending_time_when_disabled() {
-        let mut msg =
-            build_test_message_with_type("FIX.4.4", Heartbeat::MSG_TYPE, "TARGET", "SENDER", 42);
+    fn test_creating_flags_for_gap_fill_message_should_skip_check_orig_sending_time_even_for_poss_duplicate()
+     {
+        let mut msg = build_test_message_with_type(
+            "FIX.4.4",
+            SequenceReset::MSG_TYPE,
+            "TARGET",
+            "SENDER",
+            42,
+        );
         msg.header_mut().set(fix44::POSS_DUP_FLAG, true);
 
-        let flags = VerificationFlags::for_message(
-            &msg,
-            &VerificationConfig {
-                check_orig_sending_time_for_admin: false,
-            },
-        )
-        .unwrap();
+        let flags = VerificationFlags::for_message(&msg).unwrap();
 
         assert!(!flags.check_orig_sending_time);
-        assert!(flags.check_too_high);
-        assert!(flags.check_too_low);
+        assert!(!flags.check_too_high);
+        assert!(!flags.check_too_low);
     }
 
     #[test]
     fn test_creating_flags_for_app_messages_does_not_skip_orig_sending_time() {
         let mut msg = build_test_message("FIX.4.4", "TARGET", "SENDER", 42);
         msg.header_mut().set(fix44::POSS_DUP_FLAG, true);
 
-        let flags = VerificationFlags::for_message(
-            &msg,
-            &VerificationConfig {
-                check_orig_sending_time_for_admin: false,
-            },
-        )
-        .unwrap();
+        let flags = VerificationFlags::for_message(&msg).unwrap();
 
         assert!(flags.check_orig_sending_time);
         assert!(flags.check_too_high);
@@ -362,13 +337,7 @@ mod tests {
     fn test_creating_flags_for_app_messages_skip_orig_sending_time_when_it_is_not_poss_dup() {
         let msg = build_test_message("FIX.4.4", "TARGET", "SENDER", 42);
 
-        let flags = VerificationFlags::for_message(
-            &msg,
-            &VerificationConfig {
-                check_orig_sending_time_for_admin: true,
-            },
-        )
-        .unwrap();
+        let flags = VerificationFlags::for_message(&msg).unwrap();
 
         assert!(!flags.check_orig_sending_time);
         assert!(flags.check_too_high);

crates/hotfix/src/session.rs

@@ -208,7 +208,7 @@ where
             .get(MSG_TYPE)
             .map_err(|_| SessionOperationError::MissingField("MSG_TYPE"))?;
 
-        let flags = VerificationFlags::for_message(&message, self.ctx.verification_config())?;
+        let flags = VerificationFlags::for_message(&message)?;
         if let VerificationResult::Issue(result) = self
             .state
             .handle_verification_issue(&mut self.ctx, &message, flags)
@@ -755,7 +755,6 @@ async fn run_session<App, Store>(
 mod tests {
     use super::*;
     use crate::application::{InboundDecision, OutboundDecision};
-    use crate::config::VerificationConfig;
     use crate::message::OutboundMessage;
     use crate::store::{Result as StoreResult, StoreError};
     use chrono::{DateTime, Datelike, NaiveDate, NaiveTime, TimeDelta, Timelike};
@@ -892,7 +891,6 @@ mod tests {
             reconnect_interval: 30,
             reset_on_logon: false,
             schedule: None,
-            verification: VerificationConfig::default(),
         }
     }
 

crates/hotfix/src/session/ctx.rs

@@ -3,7 +3,6 @@ use hotfix_message::message::Config as MessageConfig;
 use hotfix_store::MessageStore;
 
 use crate::config::SessionConfig;
-use crate::config::VerificationConfig;
 use crate::message::OutboundMessage;
 use crate::message::generate_message;
 use crate::message::parser::RawFixMessage;
@@ -89,8 +88,4 @@ impl<A, S: MessageStore> SessionCtx<A, S> {
             raw: RawFixMessage::new(msg),
         })
     }
-
-    pub fn verification_config(&self) -> &VerificationConfig {
-        &self.config.verification
-    }
 }

crates/hotfix/src/session/test_utils.rs

@@ -1,4 +1,4 @@
-use crate::config::{SessionConfig, VerificationConfig};
+use crate::config::SessionConfig;
 use crate::session::ctx::SessionCtx;
 use crate::store::{MessageStore, Result as StoreResult};
 use crate::transport::writer::{WriterMessage, WriterRef};
@@ -87,7 +87,6 @@ pub(crate) fn create_test_ctx(store: FakeMessageStore) -> SessionCtx<(), FakeMes
             reconnect_interval: 30,
             reset_on_logon: false,
             schedule: None,
-            verification: VerificationConfig::default(),
         },
         store,
         application: (),