Move Certificate and PrivateKey into their own tls module

src/domain.rs

@@ -5,6 +5,7 @@ pub mod manager;
 mod name;
 mod settings;
 pub mod store;
+mod tls;
 
 pub use config::*;
 pub use name::*;

src/domain/acme.rs

@@ -1,8 +1,2 @@
 pub mod manager;
 pub mod store;
-
-mod private_key;
-pub use self::private_key::PrivateKey;
-
-mod certificate;
-pub use self::certificate::Certificate;

src/domain/acme/manager.rs

@@ -1,6 +1,7 @@
 use std::{sync, time};
 
-use crate::domain::acme::{self, Certificate, PrivateKey};
+use crate::domain::acme;
+use crate::domain::tls::{Certificate, PrivateKey};
 use crate::error::unexpected::{self, Intoable, Mappable};
 use crate::{domain, token, util};
 
@@ -80,7 +81,7 @@ impl ManagerImpl {
             .await
             .or_unexpected_while("building account")?;
 
-        let account_key: acme::PrivateKey = account
+        let account_key: PrivateKey = account
             .private_key()
             .as_ref()
             .try_into()
@@ -242,7 +243,7 @@ impl Manager for ManagerImpl {
             }
 
             // Generate an RSA private key for the certificate.
-            let pkey = acme::PrivateKey::new();
+            let pkey = PrivateKey::new();
 
             let acme2_pkey = (&pkey)
                 .try_into()
@@ -287,8 +288,8 @@ impl Manager for ManagerImpl {
                     "expected the order to return a certificate",
                 ))?
                 .into_iter()
-                .map(|cert| acme::Certificate::try_from(cert.as_ref()))
-                .try_collect::<Vec<acme::Certificate>>()
+                .map(|cert| Certificate::try_from(cert.as_ref()))
+                .try_collect::<Vec<Certificate>>()
                 .or_unexpected_while("parsing certificate")?;
 
             if cert.len() <= 1 {

src/domain/acme/store.rs

@@ -2,7 +2,7 @@ use std::io::{Read, Write};
 use std::str::FromStr;
 use std::{fs, path};
 
-use crate::domain::acme::{Certificate, PrivateKey};
+use crate::domain::tls::{Certificate, PrivateKey};
 use crate::error::unexpected::{self, Mappable};
 use crate::util;
 

src/domain/tls.rs

@@ -0,0 +1,5 @@
+mod private_key;
+pub use self::private_key::PrivateKey;
+
+mod certificate;
+pub use self::certificate::Certificate;