From b51566d8e2e608d50350482edee98b1d82fc9ece Mon Sep 17 00:00:00 2001
From: Olivier Lacroix <olivier.lacroix@m4x.org>
Date: Sun, 19 May 2024 15:22:03 +1000
Subject: [PATCH 1/2] Remove unused fetch_sparse_repodata

---
 src/project/repodata.rs | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/project/repodata.rs b/src/project/repodata.rs
index 09dfd7406..2b4c79d5a 100644
--- a/src/project/repodata.rs
+++ b/src/project/repodata.rs
@@ -1,20 +1,9 @@
-use crate::project::has_features::HasFeatures;
-use crate::project::Environment;
-use crate::{config, project::Project, repodata};
-use indexmap::IndexMap;
-use rattler_conda_types::{Channel, Platform};
-use rattler_repodata_gateway::{sparse::SparseRepoData, ChannelConfig, Gateway, SourceConfig};
+use crate::{config, project::Project};
+use rattler_repodata_gateway::{ChannelConfig, Gateway, SourceConfig};
 use std::path::PathBuf;
 use std::sync::Arc;
 
 impl Project {
-    // TODO: Remove this function once everything is migrated to the new environment system.
-    pub async fn fetch_sparse_repodata(
-        &self,
-    ) -> miette::Result<IndexMap<(Channel, Platform), SparseRepoData>> {
-        self.default_environment().fetch_sparse_repodata().await
-    }
-
     /// Returns the [`Gateway`] used by this project.
     pub fn repodata_gateway(&self) -> &Arc<Gateway> {
         self.repodata_gateway.get_or_init(|| {
@@ -51,19 +40,3 @@ impl Project {
         })
     }
 }
-
-impl Environment<'_> {
-    pub async fn fetch_sparse_repodata(
-        &self,
-    ) -> miette::Result<IndexMap<(Channel, Platform), SparseRepoData>> {
-        let channels = self.channels();
-        let platforms = self.platforms();
-        repodata::fetch_sparse_repodata(
-            channels,
-            platforms,
-            self.project().authenticated_client(),
-            Some(self.project().config()),
-        )
-        .await
-    }
-}

From 8c029330b0094bcd94a880077f7fb7d53a67320d Mon Sep 17 00:00:00 2001
From: Olivier Lacroix <olivier.lacroix@m4x.org>
Date: Sun, 19 May 2024 15:35:12 +1000
Subject: [PATCH 2/2] Gateway is already cheaply clonable

---
 src/lock_file/update.rs | 2 +-
 src/project/mod.rs      | 2 +-
 src/project/repodata.rs | 9 +++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/lock_file/update.rs b/src/lock_file/update.rs
index 7d6961f3b..625fb6f63 100644
--- a/src/lock_file/update.rs
+++ b/src/lock_file/update.rs
@@ -1148,7 +1148,7 @@ enum TaskResult {
 async fn spawn_solve_conda_environment_task(
     group: GroupedEnvironment<'_>,
     existing_repodata_records: Arc<RepoDataRecordsByName>,
-    repodata_gateway: Arc<Gateway>,
+    repodata_gateway: Gateway,
     platform: Platform,
     concurrency_semaphore: Arc<Semaphore>,
     client: reqwest::Client,
diff --git a/src/project/mod.rs b/src/project/mod.rs
index c848ef0f1..867e92082 100644
--- a/src/project/mod.rs
+++ b/src/project/mod.rs
@@ -104,7 +104,7 @@ pub struct Project {
     authenticated_client: ClientWithMiddleware,
     /// The repodata gateway to use for answering queries about repodata.
     /// This is wrapped in a `OnceLock` to allow for lazy initialization.
-    repodata_gateway: OnceLock<Arc<Gateway>>,
+    repodata_gateway: OnceLock<Gateway>,
     /// The manifest for the project
     pub(crate) manifest: Manifest,
     /// The cache that contains environment variables
diff --git a/src/project/repodata.rs b/src/project/repodata.rs
index 2b4c79d5a..e12dc38aa 100644
--- a/src/project/repodata.rs
+++ b/src/project/repodata.rs
@@ -1,11 +1,10 @@
 use crate::{config, project::Project};
 use rattler_repodata_gateway::{ChannelConfig, Gateway, SourceConfig};
 use std::path::PathBuf;
-use std::sync::Arc;
 
 impl Project {
     /// Returns the [`Gateway`] used by this project.
-    pub fn repodata_gateway(&self) -> &Arc<Gateway> {
+    pub fn repodata_gateway(&self) -> &Gateway {
         self.repodata_gateway.get_or_init(|| {
             // Determine the cache directory and fall back to sane defaults otherwise.
             let cache_dir = config::get_cache_dir().unwrap_or_else(|e| {
@@ -27,16 +26,14 @@ impl Project {
                 .unwrap_or_default();
 
             // Construct the gateway
-            let gateway = Gateway::builder()
+            Gateway::builder()
                 .with_client(self.authenticated_client().clone())
                 .with_cache_dir(cache_dir.join("repodata"))
                 .with_channel_config(ChannelConfig {
                     default: default_source_config,
                     per_channel: Default::default(),
                 })
-                .finish();
-
-            Arc::new(gateway)
+                .finish()
         })
     }
 }