From 490c0b037dd4b0a40515a797c302f436c2e32e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Fri, 15 Oct 2021 21:59:46 +0200
Subject: [PATCH] AccessListMode: rename Allow to Require and Deny to Forbid

---
 TODO.md                           | 1 -
 aquatic_common/src/access_list.rs | 8 ++++----
 aquatic_udp/src/lib/handlers.rs   | 2 +-
 aquatic_udp/src/lib/lib.rs        | 2 +-
 aquatic_udp/src/lib/tasks.rs      | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/TODO.md b/TODO.md
index c7eea67..ad4ca6f 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,7 +2,6 @@
 
 * access lists:
   * test functionality
-  * rename Allow to Require?
   * implement for aquatic_http and aquatic_ws
 
 * Don't unwrap peer_address
diff --git a/aquatic_common/src/access_list.rs b/aquatic_common/src/access_list.rs
index 6753d0a..b91776c 100644
--- a/aquatic_common/src/access_list.rs
+++ b/aquatic_common/src/access_list.rs
@@ -8,8 +8,8 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Copy, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum AccessListMode {
-    Allow,
-    Deny,
+    Require,
+    Forbid,
     Ignore,
 }
 
@@ -57,8 +57,8 @@ impl AccessList {
 
     pub fn allows(&self, list_type: AccessListMode, info_hash_bytes: &[u8; 20]) -> bool {
         match list_type {
-            AccessListMode::Allow => self.0.contains(info_hash_bytes),
-            AccessListMode::Deny => !self.0.contains(info_hash_bytes),
+            AccessListMode::Require => self.0.contains(info_hash_bytes),
+            AccessListMode::Forbid => !self.0.contains(info_hash_bytes),
             AccessListMode::Ignore => true,
         }
     }
diff --git a/aquatic_udp/src/lib/handlers.rs b/aquatic_udp/src/lib/handlers.rs
index 0b93786..019ed54 100644
--- a/aquatic_udp/src/lib/handlers.rs
+++ b/aquatic_udp/src/lib/handlers.rs
@@ -126,7 +126,7 @@ pub fn run_request_worker(
         // Check announce requests for allowed info hashes
 
         match config.access_list.mode {
-            access_list_type @ (AccessListMode::Allow | AccessListMode::Deny) => {
+            access_list_type @ (AccessListMode::Require | AccessListMode::Forbid) => {
                 let access_list: MutexGuard<AccessList> = state.access_list.lock();
 
                 announce_requests.retain(|(request, src)| {
diff --git a/aquatic_udp/src/lib/lib.rs b/aquatic_udp/src/lib/lib.rs
index 04383ad..4b16a8f 100644
--- a/aquatic_udp/src/lib/lib.rs
+++ b/aquatic_udp/src/lib/lib.rs
@@ -25,7 +25,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
     let state = State::default();
 
     match config.access_list.mode {
-        AccessListMode::Allow | AccessListMode::Deny => {
+        AccessListMode::Require | AccessListMode::Forbid => {
             state.access_list.lock().update_from_path(&config.access_list.path)?;
         },
         AccessListMode::Ignore => {},
diff --git a/aquatic_udp/src/lib/tasks.rs b/aquatic_udp/src/lib/tasks.rs
index 97df21c..04216bb 100644
--- a/aquatic_udp/src/lib/tasks.rs
+++ b/aquatic_udp/src/lib/tasks.rs
@@ -19,7 +19,7 @@ pub fn clean_connections_and_torrents(config: &Config, state: &State) {
     }
 
     match config.access_list.mode {
-        AccessListMode::Allow | AccessListMode::Deny => {
+        AccessListMode::Require | AccessListMode::Forbid => {
             let mut access_list = state.access_list.lock();
 
             if let Err(err) = access_list.update_from_path(&config.access_list.path) {