fix: apply formatting rules

Author: samparsky

adapter/src/ethereum.rs

@@ -489,6 +489,19 @@ mod test {
                 &signature,
             )
             .expect("Failed to verify signatures");
+        
+
+        let sig1 = "0x9fa5852041b9818021323aff8260624fd6998c52c95d9ad5036e0db6f2bf2b2d48a188ec1d638581ff56b0a2ecceca6d3880fc65030558bd8f68b154e7ebf80f1b";
+        let msg = "1648231285e69677531ffe70719f67a07f3d4393b8425a5a1c84b0c72434c77b";
+
+        let verify2 = eth_adapter
+            .verify(
+                &ValidatorId::try_from("ce07CbB7e054514D590a0262C93070D838bFBA2e")
+                    .expect("Failed to parse id"),
+                msg,
+                &sig1,
+            )
+            .expect("Failed to verify signatures");
 
         assert_eq!(verify, true, "invalid signature verification");
     }

primitives/src/util/tests/prep_db.rs

@@ -36,7 +36,7 @@ lazy_static! {
         auth.insert("user".into(), "x8c9v1b2".into());
         auth.insert("publisher".into(), "testing".into());
         auth.insert("publisher2".into(), "testing2".into());
-        auth.insert("creator".into(), "0x033ed90e0fec3f3ea1c9b005c724d704501e0196".into());
+        auth.insert("creator".into(), "0x033Ed90e0FeC3F3ea1C9b005C724D704501e0196".into());
         auth.insert("tester".into(), "AUTH_awesomeTester".into());
 
         auth

primitives/src/validator.rs

@@ -30,7 +30,7 @@ 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".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)
@@ -87,7 +87,7 @@ impl TryFrom<&str> for ValidatorId {
 
         if hex_value.len() != 40 {
             return Err(DomainError::InvalidArgument(
-                "Failed to deserialize validator id".to_string(),
+                "invalid validator id length".to_string(),
             ));
         }
 

sentry/src/access.rs

@@ -181,26 +181,22 @@ async fn apply_rule(
 }
 
 fn forbidden_referrer(session: &Session) -> bool {
-    if let Some(hostname) = session
+    match session
         .referrer_header
         .as_ref()
         .map(|rf| rf.split('/').nth(2))
         .flatten()
     {
-        return hostname == "localhost"
-            || hostname == "127.0.0.1"
-            || hostname.starts_with("localhost:")
-            || hostname.starts_with("127.0.0.1:");
+        Some(hostname) => hostname == "localhost" || hostname == "127.0.0.1" || hostname.starts_with("localhost:") || hostname.starts_with("127.0.0.1:"),
+        None => false
     }
-
-    false
 }
 
 fn forbidden_country(session: &Session) -> bool {
-    if let Some(country) = session.country.as_ref() {
-        return country == "XX";
+    match session.country.as_ref() {
+        Some(country) => country == "XX",
+        None => false
     }
-    false
 }
 
 #[cfg(test)]

sentry/src/event_aggregator.rs

@@ -124,37 +124,36 @@ impl EventAggregator {
             }
         };
 
-        let has_access = check_access(
+        check_access(
             &app.redis,
             session,
             &app.config.ip_rate_limit,
             &record.channel,
             events,
         )
-        .await;
-        if let Err(e) = has_access {
-            let err = match e {
+        .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()),
-            };
-            return Err(err);
-        }
+            }
+        })?;
 
         events
             .iter()
             .for_each(|ev| event_reducer::reduce(&record.channel, &mut record.aggregate, ev));
 
         // only time we don't have session is during
         // an unauthenticated close event
-        if ANALYTICS_RECORDER.is_some() && session.is_some() {
+        if let (true, Some(session)) = (ANALYTICS_RECORDER.is_some(), session) {
             tokio::spawn(analytics_recorder::record(
                 redis.clone(),
                 record.channel.clone(),
-                session.expect("should have session").clone(),
+                session.clone(),
                 events.to_owned().to_vec(),
                 app.logger.clone(),
             ));