cargo fmt

src/auth/token.rs

@@ -209,7 +209,6 @@ async fn post_lookup(
 // The following functions are placeholders for the various token-related operations.
 //
 
-
 async fn get_accessors() -> &'static str {
     todo!("not implemented")
 }

src/common.rs

@@ -1,8 +1,8 @@
 use axum::{
+    Json,
     body::Body,
     http::StatusCode,
     response::{IntoResponse, Response},
-    Json,
 };
 use serde::Serialize;
 

src/engines.rs

@@ -1,11 +1,11 @@
 pub mod kv;
 
 use axum::{
+    Extension, Router,
     body::Body,
     extract::{Request, State},
     http::{StatusCode, Uri},
     response::{IntoResponse, Response},
-    Extension, Router,
 };
 use log::*;
 use tower::Service;

src/engines/kv.rs

@@ -1,15 +1,12 @@
-mod structs;
 mod data;
 mod meta;
+mod structs;
 
 // #[cfg(test)]
 // mod tests;
 
 use crate::storage::DbPool;
-use axum::{
+use axum::{Router, routing::*};
-    Router,
-    routing::*,
-};
 
 pub fn kv_router(pool: DbPool) -> Router {
     Router::new()

src/engines/kv/data.rs

@@ -7,9 +7,13 @@
 
 use super::structs::KvV2WriteRequest;
 use crate::{
-    common::HttpError, engines::{
+    DbPool,
-        kv::structs::{KvSecretData, KvSecretRes, KvV2WriteResponse, Wrapper}, EnginePath
+    common::HttpError,
-    }, storage::sealing::Secret, DbPool
+    engines::{
+        EnginePath,
+        kv::structs::{KvSecretData, KvSecretRes, KvV2WriteResponse, Wrapper},
+    },
+    storage::sealing::Secret,
 };
 use axum::{
     Extension, Json,
@@ -128,7 +132,10 @@ pub async fn post_data(
 
     let content = serde_json::to_string(&secret.data).unwrap();
 
-    let Secret { nonce, protected_data } = Secret::encrypt(&content).await.unwrap();
+    let Secret {
+        nonce,
+        protected_data,
+    } = Secret::encrypt(&content).await.unwrap();
     let nonce = nonce.as_slice();
 
     let mut tx = pool.begin().await.unwrap();

src/main.rs

@@ -8,12 +8,12 @@
 
 use crate::common::HttpError;
 use axum::{
+    Router,
     extract::Request,
     http::StatusCode,
     middleware::{self, Next},
     response::{IntoResponse, Response},
     routing::get,
-    Router,
 };
 use log::*;
 use std::{env, net::SocketAddr, str::FromStr};

src/storage.rs

@@ -3,7 +3,7 @@ pub mod sealing;
 use std::{fs::File, path::Path};
 
 use log::*;
-use sqlx::{sqlite::SqlitePoolOptions, Pool, Sqlite};
+use sqlx::{Pool, Sqlite, sqlite::SqlitePoolOptions};
 
 pub(crate) type DbType = Sqlite;
 pub(crate) type DbPool = Pool<DbType>;

src/storage/sealing/shamir.rs

@@ -15,7 +15,7 @@ use zeroize::ZeroizeOnDrop;
 
 use crate::DbPool;
 
-use super::{write_new_root_key, Sealing, UnsealResult};
+use super::{Sealing, UnsealResult, write_new_root_key};
 
 type P256Share = DefaultShare<IdentifierPrimeField<Scalar>, IdentifierPrimeField<Scalar>>;
 
@@ -38,7 +38,7 @@ pub struct ShamirBucket {
 }
 
 impl Sealing for ShamirBucket {
-     fn new(protected_rk: Vec<u8>, nonce: Vec<u8>) -> Self {
+    fn new(protected_rk: Vec<u8>, nonce: Vec<u8>) -> Self {
         Self {
             portions: Vec::with_capacity(2),
             protected_rk,
@@ -46,7 +46,7 @@ impl Sealing for ShamirBucket {
         }
     }
 
-     async fn unseal(&mut self, key: String) -> UnsealResult {
+    async fn unseal(&mut self, key: String) -> UnsealResult {
         let key = match BASE64_STANDARD.decode(key) {
             Ok(v) => v,
             Err(e) => {

src/storage/sealing/simple.rs

@@ -6,7 +6,7 @@ use base64::{Engine, prelude::BASE64_STANDARD};
 
 use crate::DbPool;
 
-use super::{write_new_root_key, Sealing, UnsealResult};
+use super::{Sealing, UnsealResult, write_new_root_key};
 
 /// Pair of protected root key and nonce
 #[derive(PartialEq)]

src/sys/root_generation.rs

@@ -5,8 +5,8 @@ use crate::DbPool;
 pub fn root_generation() -> Router<DbPool> {
     Router::new()
         // .route("/generate-root", get(get_root_generation_attempt))
-        .route("/generate-root", post(generate_new_root))
         // .route("/generate-root", delete(cancel_generate_root))
+        .route("/generate-root", post(generate_new_root))
 }
 
 async fn generate_new_root() {

src/sys/sealing.rs

@@ -1,5 +1,7 @@
 use axum::{
-    extract::State, routing::{get, post, put}, Json, Router
+    Json, Router,
+    extract::State,
+    routing::{get, post, put},
 };
 use log::warn;
 use serde::Deserialize;