StorageConfig: Extract in_memory() fn

Author: Turbo87

src/storage.rs

@@ -50,6 +50,10 @@ pub struct S3Config {
 }
 
 impl StorageConfig {
+    pub fn in_memory() -> Self {
+        Self::InMemory
+    }
+
     pub fn from_environment() -> Self {
         if let Ok(bucket) = dotenvy::var("S3_BUCKET") {
             let region = dotenvy::var("S3_REGION").ok();
@@ -339,7 +343,7 @@ mod tests {
     use tempfile::NamedTempFile;
 
     pub async fn prepare() -> Storage {
-        let storage = Storage::from_config(&StorageConfig::InMemory);
+        let storage = Storage::from_config(&StorageConfig::in_memory());
 
         let files_to_create = vec![
             "crates/bar/bar-2.0.0.crate",
@@ -367,7 +371,7 @@ mod tests {
 
     #[test]
     fn locations() {
-        let storage = Storage::from_config(&StorageConfig::InMemory);
+        let storage = Storage::from_config(&StorageConfig::in_memory());
 
         let crate_tests = vec![
             ("foo", "1.2.3", "/crates/foo/foo-1.2.3.crate"),
@@ -458,7 +462,7 @@ mod tests {
 
     #[tokio::test]
     async fn upload_crate_file() {
-        let s = Storage::from_config(&StorageConfig::InMemory);
+        let s = Storage::from_config(&StorageConfig::in_memory());
 
         s.upload_crate_file("foo", "1.2.3", Bytes::new())
             .await
@@ -480,7 +484,7 @@ mod tests {
 
     #[tokio::test]
     async fn upload_readme() {
-        let s = Storage::from_config(&StorageConfig::InMemory);
+        let s = Storage::from_config(&StorageConfig::in_memory());
 
         let bytes = Bytes::from_static(b"hello world");
         s.upload_readme("foo", "1.2.3", bytes.clone())
@@ -501,7 +505,7 @@ mod tests {
 
     #[tokio::test]
     async fn sync_index() {
-        let s = Storage::from_config(&StorageConfig::InMemory);
+        let s = Storage::from_config(&StorageConfig::in_memory());
 
         assert!(stored_files(&s.store).await.is_empty());
 
@@ -518,7 +522,7 @@ mod tests {
 
     #[tokio::test]
     async fn upload_db_dump() {
-        let s = Storage::from_config(&StorageConfig::InMemory);
+        let s = Storage::from_config(&StorageConfig::in_memory());
 
         assert!(stored_files(&s.store).await.is_empty());
 

src/tests/util/test_app.rs

@@ -387,7 +387,7 @@ fn simple_config() -> config::Server {
         max_blocking_threads: None,
         use_nginx_wrapper: false,
         db,
-        storage: StorageConfig::InMemory,
+        storage: StorageConfig::in_memory(),
         session_key: cookie::Key::derive_from("test this has to be over 32 bytes long".as_bytes()),
         gh_client_id: ClientId::new(dotenvy::var("GH_CLIENT_ID").unwrap_or_default()),
         gh_client_secret: ClientSecret::new(dotenvy::var("GH_CLIENT_SECRET").unwrap_or_default()),