aquatic_common: move access list code to own file

aquatic_common/src/access_list.rs

@@ -0,0 +1,77 @@
+use std::fs::File;
+use std::io::{BufRead, BufReader};
+use std::path::PathBuf;
+
+use hashbrown::HashSet;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
+pub enum AccessListType {
+    Allow,
+    Deny,
+    Ignore,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct AccessListConfig {
+    pub path: PathBuf,
+    pub list_type: AccessListType,
+}
+
+impl Default for AccessListConfig {
+    fn default() -> Self {
+        Self {
+            path: "".into(),
+            list_type: AccessListType::Ignore,
+        }
+    }
+}
+
+#[derive(Default)]
+pub struct AccessList(HashSet<[u8; 20]>);
+
+impl AccessList {
+    fn parse_info_hash(line: String) -> anyhow::Result<[u8; 20]> {
+        let mut bytes = [0u8; 20];
+
+        hex::decode_to_slice(line, &mut bytes)?;
+
+        Ok(bytes)
+    }
+
+    pub fn update_from_path(&mut self, path: &PathBuf) -> anyhow::Result<()> {
+        let file = File::open(path)?;
+        let reader = BufReader::new(file);
+
+        let mut new_list = HashSet::new();
+
+        for line in reader.lines() {
+            new_list.insert(Self::parse_info_hash(line?)?);
+        }
+
+        self.0 = new_list;
+
+        Ok(())
+    }
+
+    pub fn allows(&self, list_type: AccessListType, info_hash_bytes: &[u8; 20]) -> bool {
+        match list_type {
+            AccessListType::Allow => self.0.contains(info_hash_bytes),
+            AccessListType::Deny => !self.0.contains(info_hash_bytes),
+            AccessListType::Ignore => true,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_parse_info_hash(){
+        assert!(AccessList::parse_info_hash("aaaabbbbccccddddeeeeaaaabbbbccccddddeeee".to_owned()).is_ok());
+        assert!(AccessList::parse_info_hash("aaaabbbbccccddddeeeeaaaabbbbccccddddeeeef".to_owned()).is_err());
+        assert!(AccessList::parse_info_hash("aaaabbbbccccddddeeeeaaaabbbbccccddddeee".to_owned()).is_err());
+        assert!(AccessList::parse_info_hash("aaaabbbbccccddddeeeeaaaabbbbccccddddeeeö".to_owned()).is_err());
+    }
+}

aquatic_common/src/lib.rs

@@ -1,71 +1,10 @@
-use std::fs::File;
-use std::io::{BufRead, BufReader};
 use std::net::IpAddr;
-use std::path::PathBuf;
 use std::time::{Duration, Instant};
 
-use hashbrown::HashSet;
 use indexmap::IndexMap;
 use rand::Rng;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
-pub enum AccessListType {
-    Allow,
-    Deny,
-    Ignore,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct AccessListConfig {
-    pub path: PathBuf,
-    pub list_type: AccessListType,
-}
-
-impl Default for AccessListConfig {
-    fn default() -> Self {
-        Self {
-            path: "".into(),
-            list_type: AccessListType::Ignore,
-        }
-    }
-}
-
-#[derive(Default)]
-pub struct AccessList(HashSet<[u8; 20]>);
-
-impl AccessList {
-    fn parse_info_hash(line: String) -> anyhow::Result<[u8; 20]> {
-        let mut bytes = [0u8; 20];
-
-        hex::decode_to_slice(line, &mut bytes)?;
-
-        Ok(bytes)
-    }
-
-    pub fn update_from_path(&mut self, path: &PathBuf) -> anyhow::Result<()> {
-        let file = File::open(path)?;
-        let reader = BufReader::new(file);
-
-        let mut new_list = HashSet::new();
-
-        for line in reader.lines() {
-            new_list.insert(Self::parse_info_hash(line?)?);
-        }
-
-        self.0 = new_list;
-
-        Ok(())
-    }
-
-    pub fn allows(&self, list_type: AccessListType, info_hash_bytes: &[u8; 20]) -> bool {
-        match list_type {
-            AccessListType::Allow => self.0.contains(info_hash_bytes),
-            AccessListType::Deny => !self.0.contains(info_hash_bytes),
-            AccessListType::Ignore => true,
-        }
-    }
-}
+pub mod access_list;
 
 /// Peer or connection valid until this instant
 ///
@@ -157,16 +96,3 @@ pub fn convert_ipv4_mapped_ipv6(ip_address: IpAddr) -> IpAddr {
         ip_address
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_access_list_parse_info_hash(){
-        assert!(AccessList::parse_info_hash("aaaabbbbccccddddeeeeaaaabbbbccccddddeeee".to_owned()).is_ok());
-        assert!(AccessList::parse_info_hash("aaaabbbbccccddddeeeeaaaabbbbccccddddeeeef".to_owned()).is_err());
-        assert!(AccessList::parse_info_hash("aaaabbbbccccddddeeeeaaaabbbbccccddddeee".to_owned()).is_err());
-        assert!(AccessList::parse_info_hash("aaaabbbbccccddddeeeeaaaabbbbccccddddeeeö".to_owned()).is_err());
-    }
-}