less duplication

Author: syphar

src/context.rs

@@ -26,12 +26,34 @@ pub struct Context {
 }
 
 impl Context {
+    /// Create a new context environment from the given configuration.
+    #[cfg(not(test))]
     pub async fn from_config(config: Config) -> Result<Self> {
-        let config = Arc::new(config);
-
         let instance_metrics = Arc::new(InstanceMetrics::new()?);
-
         let pool = Pool::new(&config, instance_metrics.clone()).await?;
+        Self::from_config_with_metrics_and_pool(config, instance_metrics, pool).await
+    }
+
+    /// Create a new context environment from the given configuration, for running tests.
+    #[cfg(test)]
+    pub async fn from_config(
+        config: Config,
+        instance_metrics: Arc<InstanceMetrics>,
+        pool: Pool,
+    ) -> Result<Self> {
+        Self::from_config_with_metrics_and_pool(config, instance_metrics, pool).await
+    }
+
+    /// private function for context environment generation, allows passing in a
+    /// preconfigured instance metrics & pool from the database.
+    /// Mostly so we can support test environments with their db
+    async fn from_config_with_metrics_and_pool(
+        config: Config,
+        instance_metrics: Arc<InstanceMetrics>,
+        pool: Pool,
+    ) -> Result<Self> {
+        let config = Arc::new(config);
+
         let async_storage = Arc::new(
             AsyncStorage::new(pool.clone(), instance_metrics.clone(), config.clone()).await?,
         );

src/test/mod.rs

@@ -5,13 +5,9 @@ use crate::cdn::CdnBackend;
 use crate::config::ConfigBuilder;
 use crate::db::{self, AsyncPoolClient, Pool};
 use crate::error::Result;
-use crate::repositories::RepositoryStatsUpdater;
 use crate::storage::{AsyncStorage, Storage, StorageKind};
 use crate::web::{build_axum_app, cache, page::TemplateData};
-use crate::{
-    AsyncBuildQueue, BuildQueue, Config, Context, Index, InstanceMetrics, RegistryApi,
-    ServiceMetrics,
-};
+use crate::{AsyncBuildQueue, BuildQueue, Config, Context, InstanceMetrics};
 use anyhow::Context as _;
 use axum::body::Bytes;
 use axum::{Router, body::Body, http::Request, response::Response as AxumResponse};
@@ -358,73 +354,13 @@ impl TestEnvironment {
         // create index directory
         fs::create_dir_all(config.registry_index_path.clone())?;
 
-        let config = Arc::new(config);
-        let instance_metrics =
-            Arc::new(InstanceMetrics::new().context("failed to initialize the instance metrics")?);
-
+        let instance_metrics = Arc::new(InstanceMetrics::new()?);
         let test_db = TestDatabase::new(&config, instance_metrics.clone())
             .await
             .context("can't initialize test database")?;
-        let pool = test_db.pool();
-
-        let async_storage = Arc::new(
-            AsyncStorage::new(pool.clone(), instance_metrics.clone(), config.clone())
-                .await
-                .context("can't create async storage")?,
-        );
-
-        let async_build_queue = Arc::new(AsyncBuildQueue::new(
-            pool.clone(),
-            instance_metrics.clone(),
-            config.clone(),
-            async_storage.clone(),
-        ));
-
-        let runtime = runtime::Handle::current();
-
-        let build_queue = Arc::new(BuildQueue::new(runtime.clone(), async_build_queue.clone()));
-
-        let storage = Arc::new(Storage::new(async_storage.clone(), runtime.clone()));
-
-        let cdn = Arc::new(CdnBackend::new(&config).await);
-
-        let index = Arc::new({
-            let path = config.registry_index_path.clone();
-            if let Some(registry_url) = config.registry_url.clone() {
-                Index::from_url(path, registry_url)
-            } else {
-                Index::new(path)
-            }
-            .context("can't create Index")?
-        });
 
         Ok(Self {
-            context: Context {
-                config: config.clone(),
-                async_build_queue,
-                build_queue,
-                storage,
-                async_storage,
-                cdn,
-                pool: pool.clone(),
-                service_metrics: Arc::new(
-                    ServiceMetrics::new().context("can't initialize service metrics")?,
-                ),
-                instance_metrics,
-                index,
-                registry_api: Arc::new(
-                    RegistryApi::new(
-                        config.registry_api_host.clone(),
-                        config.crates_io_api_call_retries,
-                    )
-                    .context("can't create registry api")?,
-                ),
-                repository_stats_updater: Arc::new(RepositoryStatsUpdater::new(
-                    &config,
-                    pool.clone(),
-                )),
-                runtime,
-            },
+            context: Context::from_config(config, instance_metrics, test_db.pool().clone()).await?,
             db: test_db,
             owned_runtime: None,
         })