diff --git a/src/main.rs b/src/main.rs index 7504c0b..786e35e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,8 @@ extern crate lazy_static; extern crate rust_util; use rust_util::XResult; -use acme_lib::{DirectoryUrl, Directory, create_p384_key, create_p256_key, create_rsa_key}; +use acme_lib::{DirectoryUrl, Directory}; +use acme_lib::{create_p384_key, create_p256_key, create_rsa_key}; use acme_lib::persist::FilePersist; use clap::{App, Arg}; use std::sync::RwLock; @@ -36,6 +37,17 @@ enum Mode { Test, } +#[derive(Debug)] +struct AcmeRequest<'a> { + contract_email: &'a str, + primary_name: &'a str, + alt_names: &'a [&'a str], + algo: Algo, + mode: Mode, + dir: &'a str, + timeout: u64, +} + #[async_std::main] async fn main() -> tide::Result<()> { println!("{}", include_str!("logo.txt")); @@ -141,17 +153,6 @@ async fn main() -> tide::Result<()> { Ok(()) } -#[derive(Debug)] -struct AcmeRequest<'a> { - contract_email: &'a str, - primary_name: &'a str, - alt_names: &'a [&'a str], - algo: Algo, - mode: Mode, - dir: &'a str, - timeout: u64, -} - fn request_domains(acme_request: AcmeRequest) -> XResult<()> { information!("Acme mode: {:?}", acme_request.mode); let url = match acme_request.mode {