Core refactoring

tests/src/directory/ldap.rs

@@ -25,7 +25,7 @@ async fn ldap_directory() {
     let mut config = DirectoryTest::new("sqlite".into()).await;
     let handle = config.directories.directories.remove("ldap").unwrap();
     let base_store = config.stores.stores.get("sqlite").unwrap();
-    let core = config.core;
+    let core = config.server;
 
     // Test authentication
     assert_eq!(

tests/src/directory/mod.rs

@@ -10,7 +10,7 @@ pub mod ldap;
 pub mod smtp;
 pub mod sql;
 
-use common::{config::smtp::session::AddressMapping, Core};
+use common::{config::smtp::session::AddressMapping, Core, Server};
 use directory::{
     backend::internal::{manage::ManageDirectory, PrincipalField},
     Directories, Principal, Type,
@@ -254,7 +254,7 @@ pub struct DirectoryTest {
     pub directories: Directories,
     pub stores: Stores,
     pub temp_dir: TempDir,
-    pub core: Core,
+    pub server: Server,
 }
 
 #[derive(Debug, Default, Clone, PartialEq, Eq)]
@@ -311,7 +311,10 @@ impl DirectoryTest {
             directories,
             stores,
             temp_dir,
-            core,
+            server: Server {
+                inner: Default::default(),
+                core: core.into(),
+            },
         }
     }
 }
@@ -598,7 +601,7 @@ async fn address_mappings() {
     let mut config = utils::config::Config::new(MAPPINGS).unwrap();
     const ADDR: &str = "john.doe+alias@example.org";
     const ADDR_NO_MATCH: &str = "jane@example.org";
-    let core = Core::default();
+    let core = Server::default();
 
     for test in ["enable", "disable", "custom"] {
         let catch_all = AddressMapping::parse(&mut config, (test, "catch-all"));

tests/src/directory/smtp.rs

@@ -30,7 +30,7 @@ async fn lmtp_directory() {
     // Obtain directory handle
     let mut config = DirectoryTest::new(None).await;
     let handle = config.directories.directories.remove("smtp").unwrap();
-    let core = config.core;
+    let core = config.server;
 
     // Basic lookup
     let tests = vec![

tests/src/directory/sql.rs

@@ -33,7 +33,7 @@ async fn sql_directory() {
             store: config.stores.lookup_stores.remove(directory_id).unwrap(),
         };
         let base_store = config.stores.stores.get(directory_id).unwrap();
-        let core = config.core;
+        let core = config.server;
 
         // Create tables
         store.create_test_directory().await;