Remove Channel::base_url

mamba-org · Nov 20, 2023 · f0e721c · f0e721c
1 parent 74f1b5b
commit f0e721c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/libmamba/include/mamba/core/channel.hpp b/libmamba/include/mamba/core/channel.hpp
@@ -98,7 +98,6 @@ namespace mamba
 
         [[nodiscard]] auto contains_equivalent(const Channel& other) const -> bool;
 
-        [[nodiscard]] auto base_url() const -> std::string;
         [[nodiscard]] auto
         platform_url(std::string_view platform, bool with_credential = true) const -> std::string;
         // The pairs consist of (platform,url)

diff --git a/libmamba/src/api/list.cpp b/libmamba/src/api/list.cpp
@@ -75,7 +75,8 @@ namespace mamba
                     {
                         auto channels = channel_context.make_chan(pkg_info.url);
                         assert(channels.size() == 1);  // A URL can only resolve to one channel
-                        obj["base_url"] = channels.front().base_url();
+                        obj["base_url"] = channels.front().url().str(specs::CondaURL::Credentials::Remove
+                        );
                         obj["build_number"] = pkg_info.build_number;
                         obj["build_string"] = pkg_info.build_string;
                         obj["channel"] = channels.front().display_name();

diff --git a/libmamba/src/core/channel.cpp b/libmamba/src/core/channel.cpp
@@ -120,11 +120,6 @@ namespace mamba
         return url_equivalent_with(other) && util::set_is_superset_of(platforms(), other.platforms());
     }
 
-    auto Channel::base_url() const -> std::string
-    {
-        return url().str(specs::CondaURL::Credentials::Remove);
-    }
-
     auto Channel::urls(bool with_credential) const -> util::flat_set<std::string>
     {
         if (!url().package().empty())

diff --git a/libmamba/tests/src/core/test_channel.cpp b/libmamba/tests/src/core/test_channel.cpp
@@ -590,7 +590,7 @@ namespace mamba
             const auto channels1 = channel_context.make_chan("http://localhost:8000/");
             REQUIRE_EQ(channels1.size(), 1);
             CHECK_EQ(channels1.front().platform_url("win-64", false), "http://localhost:8000/win-64");
-            CHECK_EQ(channels1.front().base_url(), "http://localhost:8000/");
+            CHECK_EQ(channels1.front().url().str(), "http://localhost:8000/");
             const UrlSet expected_urls({ std::string("http://localhost:8000/") + platform,
                                          "http://localhost:8000/noarch" });
             CHECK_EQ(channels1.front().urls(true), expected_urls);