fix: merge conflicts

Author: samparsky

adapter/src/ethereum.rs

@@ -476,11 +476,8 @@ mod test {
         assert_eq!(expected_response, signature, "invalid signature");
 
         // Verify
-<<<<<<< HEAD
         let signature =
             "0x9e07f12958ce7c5eb1362eb9461e4745dd9d74a42b921391393caea700bfbd6e1ad876a7d8f9202ef1fe6110dbfe87840c5676ca5c4fda9f3330694a1ac2a1fc1b";
-=======
->>>>>>> 89abe43... fix: date check & ethereum sign
         let verify = eth_adapter
             .verify(
                 &ValidatorId::try_from("2892f6C41E0718eeeDd49D98D648C789668cA67d")
@@ -489,7 +486,6 @@ mod test {
                 &signature,
             )
             .expect("Failed to verify signatures");
-        
 
         let sig1 = "0x9fa5852041b9818021323aff8260624fd6998c52c95d9ad5036e0db6f2bf2b2d48a188ec1d638581ff56b0a2ecceca6d3880fc65030558bd8f68b154e7ebf80f1b";
         let msg = "1648231285e69677531ffe70719f67a07f3d4393b8425a5a1c84b0c72434c77b";

primitives/src/validator.rs

@@ -30,7 +30,9 @@ where
 {
     let validator_id = String::deserialize(deserializer)?;
     if validator_id.is_empty() || validator_id.len() != 42 {
-        return Err(serde::de::Error::custom("invalid validator id length".to_string()));
+        return Err(serde::de::Error::custom(
+            "invalid validator id length".to_string(),
+        ));
     }
 
     <[u8; 20] as FromHex>::from_hex(&validator_id[2..]).map_err(serde::de::Error::custom)

sentry/src/access.rs

@@ -187,15 +187,20 @@ fn forbidden_referrer(session: &Session) -> bool {
         .map(|rf| rf.split('/').nth(2))
         .flatten()
     {
-        Some(hostname) => hostname == "localhost" || hostname == "127.0.0.1" || hostname.starts_with("localhost:") || hostname.starts_with("127.0.0.1:"),
-        None => false
+        Some(hostname) => {
+            hostname == "localhost"
+                || hostname == "127.0.0.1"
+                || hostname.starts_with("localhost:")
+                || hostname.starts_with("127.0.0.1:")
+        }
+        None => false,
     }
 }
 
 fn forbidden_country(session: &Session) -> bool {
     match session.country.as_ref() {
         Some(country) => country == "XX",
-        None => false
+        None => false,
     }
 }
 

sentry/src/event_aggregator.rs

@@ -132,15 +132,13 @@ impl EventAggregator {
             events,
         )
         .await
-        .map_err(|e| {
-            match e {
-                AccessError::OnlyCreatorCanCloseChannel | AccessError::ForbiddenReferrer => {
-                    ResponseError::Forbidden(e.to_string())
-                }
-                AccessError::RulesError(error) => ResponseError::TooManyRequests(error),
-                AccessError::UnAuthenticated => ResponseError::Unauthorized,
-                _ => ResponseError::BadRequest(e.to_string()),
+        .map_err(|e| match e {
+            AccessError::OnlyCreatorCanCloseChannel | AccessError::ForbiddenReferrer => {
+                ResponseError::Forbidden(e.to_string())
             }
+            AccessError::RulesError(error) => ResponseError::TooManyRequests(error),
+            AccessError::UnAuthenticated => ResponseError::Unauthorized,
+            _ => ResponseError::BadRequest(e.to_string()),
         })?;
 
         events