Skip to content

Commit f1b1a36

Browse files
committed
self-review fixes
1 parent 4181ee1 commit f1b1a36

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

nexus/db-queries/src/db/datastore/update.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use uuid::Uuid;
3636

3737
/// The return value of [`DataStore::tuf_repo_insert`].
3838
///
39-
/// This is similar to [`external::TufRepoInsertResponse`], but uses
39+
/// This is similar to [`views::TufRepoUpload`], but uses
4040
/// nexus-db-model's types instead of external types.
4141
pub struct TufRepoInsertResponse {
4242
pub recorded: TufRepoDescription,
@@ -204,7 +204,7 @@ impl DataStore {
204204
}
205205

206206
/// List all TUF repositories (without artifacts) ordered by system version (newest first by default).
207-
pub async fn tuf_repo_list_no_artifacts(
207+
pub async fn tuf_repo_list(
208208
&self,
209209
opctx: &OpContext,
210210
pagparams: &DataPageParams<'_, Version>,

nexus/src/app/update.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,22 +95,18 @@ impl super::Nexus {
9595
&self,
9696
opctx: &OpContext,
9797
system_version: Version,
98-
) -> Result<nexus_db_model::TufRepo, HttpError> {
98+
) -> Result<nexus_db_model::TufRepo, Error> {
9999
self.db_datastore
100100
.tuf_repo_get_by_version(opctx, system_version.into())
101101
.await
102-
.map_err(HttpError::from)
103102
}
104103

105104
pub(crate) async fn updates_list_repositories(
106105
&self,
107106
opctx: &OpContext,
108107
pagparams: &DataPageParams<'_, Version>,
109-
) -> Result<Vec<nexus_db_model::TufRepo>, HttpError> {
110-
self.db_datastore
111-
.tuf_repo_list_no_artifacts(opctx, pagparams)
112-
.await
113-
.map_err(HttpError::from)
108+
) -> Result<Vec<nexus_db_model::TufRepo>, Error> {
109+
self.db_datastore.tuf_repo_list(opctx, pagparams).await
114110
}
115111

116112
pub(crate) async fn updates_add_trust_root(

0 commit comments

Comments
 (0)