CLI account management + Directory refactoring

tests/src/smtp/inbound/auth.rs

@@ -21,7 +21,7 @@
  * for more details.
 */
 
-use directory::config::ConfigDirectory;
+use directory::core::config::ConfigDirectory;
 use smtp_proto::{AUTH_LOGIN, AUTH_PLAIN};
 use store::Stores;
 use utils::config::{Config, DynValue};

tests/src/smtp/inbound/data.rs

@@ -21,7 +21,7 @@
  * for more details.
 */
 
-use directory::config::ConfigDirectory;
+use directory::core::config::ConfigDirectory;
 use store::Stores;
 use utils::config::Config;
 

tests/src/smtp/inbound/dmarc.rs

@@ -26,7 +26,7 @@ use std::{
     time::{Duration, Instant},
 };
 
-use directory::config::ConfigDirectory;
+use directory::core::config::ConfigDirectory;
 use mail_auth::{
     common::{parse::TxtRecordParser, verify::DomainKey},
     dkim::DomainKeyReport,

tests/src/smtp/inbound/rcpt.rs

@@ -23,7 +23,7 @@
 
 use std::time::Duration;
 
-use directory::config::ConfigDirectory;
+use directory::core::config::ConfigDirectory;
 use smtp_proto::{RCPT_NOTIFY_DELAY, RCPT_NOTIFY_FAILURE, RCPT_NOTIFY_SUCCESS};
 use store::Stores;
 use utils::config::Config;

tests/src/smtp/inbound/rewrite.rs

@@ -22,7 +22,7 @@
 */
 
 use crate::smtp::{inbound::sign::TextConfigContext, session::TestSession, TestConfig};
-use directory::config::ConfigDirectory;
+use directory::core::config::ConfigDirectory;
 use smtp::{
     config::{if_block::ConfigIf, scripts::ConfigSieve, ConfigContext, EnvelopeKey, IfBlock},
     core::{Session, SMTP},

tests/src/smtp/inbound/scripts.rs

@@ -29,7 +29,7 @@ use crate::smtp::{
     session::{TestSession, VerifyResponse},
     TestConfig, TestSMTP,
 };
-use directory::config::ConfigDirectory;
+use directory::core::config::ConfigDirectory;
 use smtp::{
     config::{scripts::ConfigSieve, session::ConfigSession, ConfigContext, EnvelopeKey, IfBlock},
     core::{Session, SMTP},

tests/src/smtp/inbound/sign.rs

@@ -23,7 +23,7 @@
 
 use std::time::{Duration, Instant};
 
-use directory::config::ConfigDirectory;
+use directory::core::config::ConfigDirectory;
 use mail_auth::{
     common::{parse::TxtRecordParser, verify::DomainKey},
     spf::Spf,

tests/src/smtp/inbound/vrfy.rs

@@ -21,7 +21,7 @@
  * for more details.
 */
 
-use directory::config::ConfigDirectory;
+use directory::core::config::ConfigDirectory;
 use store::Stores;
 use utils::config::Config;
 

tests/src/smtp/lookup/sql.rs

@@ -23,7 +23,7 @@
 
 use std::time::Duration;
 
-use directory::config::ConfigDirectory;
+use directory::core::config::ConfigDirectory;
 use smtp_proto::{AUTH_LOGIN, AUTH_PLAIN};
 use store::config::ConfigStore;
 use utils::config::{Config, DynValue};

tests/src/smtp/management/queue.rs

@@ -27,7 +27,7 @@ use std::{
 };
 
 use ahash::{AHashMap, HashMap, HashSet};
-use directory::config::ConfigDirectory;
+use directory::core::config::ConfigDirectory;
 use mail_auth::MX;
 use mail_parser::DateTime;
 use reqwest::{header::AUTHORIZATION, StatusCode};

tests/src/smtp/management/report.rs

@@ -24,7 +24,7 @@
 use std::sync::Arc;
 
 use ahash::{AHashMap, HashSet};
-use directory::config::ConfigDirectory;
+use directory::core::config::ConfigDirectory;
 use mail_auth::{
     common::parse::TxtRecordParser,
     dmarc::Dmarc,

tests/src/smtp/mod.rs

@@ -25,7 +25,7 @@ use std::{path::PathBuf, sync::Arc, time::Duration};
 
 use ahash::AHashMap;
 use dashmap::DashMap;
-use directory::backend::memory::MemoryDirectory;
+use directory::Directory;
 use mail_auth::{
     common::lru::{DnsCache, LruCache},
     hickory_resolver::config::{ResolverConfig, ResolverOpts},
@@ -342,7 +342,7 @@ impl TestConfig for QueueConfig {
                 rcpt: vec![],
                 rcpt_domain: vec![],
             },
-            management_lookup: Arc::new(MemoryDirectory::default()),
+            management_lookup: Arc::new(Directory::default()),
         }
     }
 }