fix merge issues

Author: laisee

Cargo.toml

@@ -33,3 +33,7 @@ base64 = "0.22.1"
 # Disable the needless_return lint globally
 # Note: This key does not exist in clippy.toml directly, hence inline attributes are preferred.
 
+[dev-dependencies]
+serial_test = "3.2.0"
+mockall = "0.12.1"
+

src/lib.rs

@@ -7,6 +7,8 @@ pub mod scenarios {
     pub mod rfq_listen;
     pub mod rfq_publish;
     pub mod single_leg_order;
+    #[cfg(test)]
+    mod tests;
 }
 pub mod config;
 pub mod setup;

src/messages/utils/jwt_tests.rs

@@ -1,39 +1,30 @@
 #[cfg(test)]
 mod jwt_tests {
-    use super::*;
     use jwtk::ecdsa::EcdsaPrivateKey;
-    
+
+    use crate::messages::utils::{generate_access_token, generate_jwt};
+
     fn setup_test_key() -> EcdsaPrivateKey {
-        // This would need a valid test key for actual testing
-        // For now, we'll just create a placeholder that would be replaced with actual test keys
-        let test_pem = "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEILULtd0+Rx4/vMF/cVZ/SYU6Fo/HlgQF==\n-----END EC PRIVATE KEY-----";
+        let test_pem = "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFxrWIO1BpNTG1oiLRKc9fPHUuF3PHtx9RgNJAdZWhDBoAoGCCqGSM49\nAwEHoUQDQgAEdqr9eg/9hxsGwHatmOMyAQX2PfW1uj8RA4xKy3e4mUTO0+nUPlwl\n1ZqiYMy8ciFFRu6Jj7WDU/lVrqB1HvnCgQ==\n-----END EC PRIVATE KEY-----";
         EcdsaPrivateKey::from_pem(test_pem.as_bytes()).expect("Test key creation failed")
     }
-    
+
     #[test]
     fn test_generate_jwt_structure() {
-        // This test would verify the JWT has the correct structure
-        // Would need proper test keys to actually run
-        /*
         let key = setup_test_key();
         let api_key = "test_api_key".to_string();
         let now = 1234567890;
         let uri = "wss://test.example.com".to_string();
-        
         let token = generate_jwt(api_key.clone(), now, uri.clone(), key);
-        
-        // Verify token is not empty
         assert!(!token.is_empty());
-        
-        // Verify token has three parts separated by dots
-        let parts: Vec<&str> = token.split('.').collect();
-        assert_eq!(parts.len(), 3);
-        */
+        assert_eq!(token.split('.').count(), 3);
     }
-    
+
     #[test]
     fn test_generate_access_token() {
-        // Similar to above, would verify access token generation
-        // Would need proper test keys
+        let key = setup_test_key();
+        let token = generate_access_token("api", key, "wss://example.com");
+        assert!(!token.is_empty());
+        assert_eq!(token.split('.').count(), 3);
     }
-}
+}