From 5c49c2fff6f7111e778668bdf7201b24b7a943ac Mon Sep 17 00:00:00 2001
From: Milos Stankovic <82043364+morph-dev@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:19:55 +0300
Subject: [PATCH] chore: delete unused trin-history/src/utils.rs (#1487)

---
 trin-history/src/lib.rs   |   1 -
 trin-history/src/utils.rs | 127 --------------------------------------
 2 files changed, 128 deletions(-)
 delete mode 100644 trin-history/src/utils.rs

diff --git a/trin-history/src/lib.rs b/trin-history/src/lib.rs
index 1b5c97fac..5e1bd244c 100644
--- a/trin-history/src/lib.rs
+++ b/trin-history/src/lib.rs
@@ -5,7 +5,6 @@ pub mod events;
 mod jsonrpc;
 pub mod network;
 mod storage;
-pub mod utils;
 pub mod validation;
 
 use std::sync::Arc;
diff --git a/trin-history/src/utils.rs b/trin-history/src/utils.rs
deleted file mode 100644
index 8e4c31c46..000000000
--- a/trin-history/src/utils.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use discv5::{
-    enr::NodeId,
-    kbucket::{ConnectionState, NodeStatus},
-};
-use serde_json::{json, Value};
-use std::collections::BTreeMap;
-
-use ethportal_api::{
-    types::{distance::Distance, enr::Enr},
-    utils::bytes::hex_encode,
-};
-
-type NodeMap = BTreeMap<String, String>;
-type NodeTuple = (NodeId, Enr, NodeStatus, Distance, Option<String>);
-
-/// Converts the output of the Overlay's bucket_entries method to a JSON Value
-pub fn bucket_entries_to_json(bucket_entries: BTreeMap<usize, Vec<NodeTuple>>) -> Value {
-    let mut node_count: u16 = 0;
-    let mut connected_count: u16 = 0;
-    let buckets_indexed: BTreeMap<usize, Vec<NodeMap>> = bucket_entries
-        .into_iter()
-        .map(|(bucket_index, bucket)| {
-            (
-                bucket_index,
-                bucket
-                    .iter()
-                    .map(|(node_id, enr, node_status, data_radius, client_info)| {
-                        node_count += 1;
-                        if node_status.state == ConnectionState::Connected {
-                            connected_count += 1
-                        }
-                        let mut map = BTreeMap::new();
-                        map.insert("node_id".to_owned(), hex_encode(node_id.raw()));
-                        map.insert("enr".to_owned(), enr.to_base64());
-                        map.insert("status".to_owned(), format!("{:?}", node_status.state));
-                        map.insert("radius".to_owned(), format!("{data_radius}"));
-                        if let Some(client_info) = client_info {
-                            // Expand client name if possible, otherwise leave as-is.
-                            match expand_client_name(client_info) {
-                                Some(expanded_name) => {
-                                    map.insert("client".to_owned(), expanded_name);
-                                }
-                                None => {
-                                    map.insert("client".to_owned(), client_info.to_string());
-                                }
-                            };
-                        } else {
-                            // Include address (IP:port) for convenience.
-                            // TODO: Can be removed once a portal dashboard does UI-side ENR
-                            // decoding.
-                            let port = match enr.udp4_socket() {
-                                Some(port) => format!("{port}"),
-                                None => "None".to_string(),
-                            };
-                            map.insert("address".to_owned(), port);
-                        }
-
-                        map
-                    })
-                    .collect(),
-            )
-        })
-        .collect();
-
-    json!(
-        {
-            "buckets": buckets_indexed,
-            "numBuckets": buckets_indexed.len(),
-            "numNodes": node_count,
-            "numConnected": connected_count
-        }
-    )
-}
-
-/// Expands first word of client string if it is one of:
-/// f -> fluffy
-/// t -> trin
-/// u -> ultralight
-/// Returns None if the shorthand is formatted unexpectedly.
-fn expand_client_name(client_shorthand: &str) -> Option<String> {
-    let mut client_shorthand_words = client_shorthand.split(' ');
-
-    let client_shorthand = match client_shorthand_words.next() {
-        Some(client_shorthand) => client_shorthand,
-        None => return None,
-    };
-
-    let client_name: Option<&str> = match client_shorthand {
-        "f" => Some("fluffy"),
-        "t" => Some("trin"),
-        "u" => Some("ultralight"),
-        _ => None,
-    };
-
-    match client_name {
-        Some(client_name) => {
-            let mut expanded_string: String = client_name.to_owned();
-
-            if let Some(version_string) = client_shorthand_words.next() {
-                expanded_string.push(' ');
-                expanded_string.push_str(version_string);
-            }
-            Some(expanded_string)
-        }
-        None => None,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use super::*;
-    use rstest::rstest;
-
-    #[rstest]
-    #[case("f 3", Some("fluffy 3".to_owned()))]
-    #[case("t v0.1.0", Some("trin v0.1.0".to_owned()))]
-    #[case("u", Some("ultralight".to_owned()))]
-    #[case("j v0.1.0", None)]
-    fn test_expand_client_name(
-        #[case] shorthand_client_name: String,
-        #[case] expected_expanded: Option<String>,
-    ) {
-        let expanded = expand_client_name(&shorthand_client_name);
-        assert_eq!(expanded, expected_expanded);
-    }
-}