Fix formatting issues in PR #1592

Co-Authored-By: Ian Clarke <[email protected]>

Author: devin-ai-integration[bot]

apps/freenet-ping/types/src/lib.rs.backup

@@ -0,0 +1,155 @@
+use std::{collections::HashMap, fmt::Display, time::Duration};
+
+use chrono::{DateTime, Utc};
+
+pub use chrono;
+
+#[derive(Debug, Default, serde::Serialize, serde::Deserialize)]
+#[cfg_attr(feature = "clap", derive(clap::Parser))]
+pub struct PingContractOptions {
+    /// Time to live for the ping record.
+    #[serde(with = "humantime_serde")]
+    #[cfg_attr(feature = "clap", clap(long, value_parser = duration_parser, default_value = "5s"))]
+    pub ttl: Duration,
+
+    /// The frequency to send ping record.
+    #[serde(with = "humantime_serde")]
+    #[cfg_attr(feature = "clap", clap(long, value_parser = duration_parser, default_value = "1s"))]
+    pub frequency: Duration,
+
+    /// The tag of the ping contract subscriber.
+    #[cfg_attr(feature = "clap", clap(long))]
+    pub tag: String,
+
+    /// Code hash of the ping contract.
+    #[cfg_attr(feature = "clap", clap(long))]
+    pub code_key: String,
+}
+
+#[cfg(feature = "clap")]
+#[inline]
+fn duration_parser(s: &str) -> Result<Duration, humantime::DurationError> {
+    humantime::parse_duration(s)
+}
+
+#[derive(Debug, Default, serde::Serialize, serde::Deserialize)]
+pub struct Ping {
+    from: HashMap<String, DateTime<Utc>>,
+}
+
+impl core::ops::Deref for Ping {
+    type Target = HashMap<String, DateTime<Utc>>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.from
+    }
+}
+
+impl core::ops::DerefMut for Ping {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.from
+    }
+}
+
+impl Ping {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    #[cfg(feature = "std")]
+    pub fn insert(&mut self, name: String) {
+        self.from.insert(name, Utc::now());
+    }
+
+    pub fn merge(&mut self, other: Self, ttl: Duration) -> HashMap<String, DateTime<Utc>> {
+        #[cfg(feature = "std")]
+        let now = Utc::now();
+        #[cfg(not(feature = "std"))]
+        let now = freenet_stdlib::time::now();
+
+        let mut updates = HashMap::new();
+        for (name, created_time) in other.from.into_iter() {
+            if now <= created_time + ttl {
+                match self.from.entry(name.clone()) {
+                    std::collections::hash_map::Entry::Occupied(mut occupied_entry) => {
+                        if occupied_entry.get() < &created_time {
+                            occupied_entry.insert(created_time);
+                            updates.insert(name, created_time);
+                        }
+                    }
+                    std::collections::hash_map::Entry::Vacant(vacant_entry) => {
+                        vacant_entry.insert(created_time);
+                        updates.insert(name, created_time);
+                    }
+                }
+            }
+        }
+
+        self.from.retain(|_, v| now <= *v + ttl);
+        updates
+    }
+}
+
+impl Display for Ping {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let mut entries: Vec<_> = self.from.iter().collect();
+        entries.sort_by(|a, b| a.0.cmp(b.0));
+        write!(
+            f,
+            "Ping {{ {} }}",
+            entries
+                .iter()
+                .map(|(k, v)| format!("{}: {}", k, v))
+                .collect::<Vec<_>>()
+                .join(", ")
+        )
+    }
+}
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_merge_expired() {
+        let mut ping = Ping::new();
+        ping.insert("Alice".to_string());
+        ping.insert("Bob".to_string());
+
+        let mut other = Ping::new();
+        other
+            .from
+            .insert("Alice".to_string(), Utc::now() - Duration::from_secs(6));
+        other
+            .from
+            .insert("Charlie".to_string(), Utc::now() - Duration::from_secs(6));
+
+        ping.merge(other, Duration::from_secs(5));
+
+        assert_eq!(ping.len(), 2);
+        assert!(ping.contains_key("Alice"));
+        assert!(ping.contains_key("Bob"));
+        assert!(!ping.contains_key("Charlie"));
+    }
+
+    #[test]
+    fn test_merge_ok() {
+        let mut ping = Ping::new();
+        ping.insert("Alice".to_string());
+        ping.insert("Bob".to_string());
+
+        let mut other = Ping::new();
+        other
+            .from
+            .insert("Alice".to_string(), Utc::now() - Duration::from_secs(4));
+        other
+            .from
+            .insert("Charlie".to_string(), Utc::now() - Duration::from_secs(4));
+
+        ping.merge(other, Duration::from_secs(5));
+
+        assert_eq!(ping.len(), 3);
+        assert!(ping.contains_key("Alice"));
+        assert!(ping.contains_key("Bob"));
+        assert!(ping.contains_key("Charlie"));
+    }
+}