From 9e337a2d1a5b20c690d4482d509669f50619caa9 Mon Sep 17 00:00:00 2001
From: Rodolphe Breard <rodolphe@what.tf>
Date: Tue, 25 Jun 2019 12:12:48 +0200
Subject: [PATCH] Move JWS out of acme_proto

---
 acmed/src/acme_proto.rs                      | 3 +--
 acmed/src/acme_proto/account.rs              | 4 ++--
 acmed/src/{acme_proto => }/jws.rs            | 2 +-
 acmed/src/{acme_proto => }/jws/algorithms.rs | 0
 acmed/src/{acme_proto => }/jws/jwk.rs        | 0
 acmed/src/main.rs                            | 1 +
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename acmed/src/{acme_proto => }/jws.rs (98%)
 rename acmed/src/{acme_proto => }/jws/algorithms.rs (100%)
 rename acmed/src/{acme_proto => }/jws/jwk.rs (100%)

diff --git a/acmed/src/acme_proto.rs b/acmed/src/acme_proto.rs
index d5bff80..4494733 100644
--- a/acmed/src/acme_proto.rs
+++ b/acmed/src/acme_proto.rs
@@ -1,9 +1,9 @@
 use crate::acme_proto::account::AccountManager;
-use crate::acme_proto::jws::encode_kid;
 use crate::acme_proto::structs::{
     ApiError, Authorization, AuthorizationStatus, NewOrder, Order, OrderStatus,
 };
 use crate::certificate::Certificate;
+use crate::jws::encode_kid;
 use crate::storage;
 use acme_common::crypto::Csr;
 use acme_common::error::Error;
@@ -13,7 +13,6 @@ use std::fmt;
 mod account;
 mod certificate;
 mod http;
-pub mod jws;
 pub mod structs;
 
 #[derive(Clone, Debug, PartialEq)]
diff --git a/acmed/src/acme_proto/account.rs b/acmed/src/acme_proto/account.rs
index 113156a..04a9213 100644
--- a/acmed/src/acme_proto/account.rs
+++ b/acmed/src/acme_proto/account.rs
@@ -1,8 +1,8 @@
 use crate::acme_proto::http;
-use crate::acme_proto::jws::algorithms::SignatureAlgorithm;
-use crate::acme_proto::jws::encode_jwk;
 use crate::acme_proto::structs::{Account, AccountResponse, Directory};
 use crate::certificate::Certificate;
+use crate::jws::algorithms::SignatureAlgorithm;
+use crate::jws::encode_jwk;
 use crate::storage;
 use acme_common::crypto::KeyPair;
 use acme_common::error::Error;
diff --git a/acmed/src/acme_proto/jws.rs b/acmed/src/jws.rs
similarity index 98%
rename from acmed/src/acme_proto/jws.rs
rename to acmed/src/jws.rs
index dda52bc..31617d4 100644
--- a/acmed/src/acme_proto/jws.rs
+++ b/acmed/src/jws.rs
@@ -1,4 +1,4 @@
-use crate::acme_proto::jws::algorithms::SignatureAlgorithm;
+use crate::jws::algorithms::SignatureAlgorithm;
 use acme_common::b64_encode;
 use acme_common::crypto::{sha256, KeyPair};
 use acme_common::error::Error;
diff --git a/acmed/src/acme_proto/jws/algorithms.rs b/acmed/src/jws/algorithms.rs
similarity index 100%
rename from acmed/src/acme_proto/jws/algorithms.rs
rename to acmed/src/jws/algorithms.rs
diff --git a/acmed/src/acme_proto/jws/jwk.rs b/acmed/src/jws/jwk.rs
similarity index 100%
rename from acmed/src/acme_proto/jws/jwk.rs
rename to acmed/src/jws/jwk.rs
diff --git a/acmed/src/main.rs b/acmed/src/main.rs
index 68648d2..fd6a1b0 100644
--- a/acmed/src/main.rs
+++ b/acmed/src/main.rs
@@ -7,6 +7,7 @@ mod acme_proto;
 mod certificate;
 mod config;
 mod hooks;
+mod jws;
 mod main_event_loop;
 mod rate_limits;
 mod storage;