models/krate: Remove sync fns

Author: Turbo87

src/controllers/krate/metadata.rs

@@ -122,7 +122,7 @@ pub async fn show(app: AppState, Path(name): Path<String>, req: Parts) -> AppRes
     };
 
     let top_versions = if include.versions {
-        Some(krate.async_top_versions(&mut conn).await?)
+        Some(krate.top_versions(&mut conn).await?)
     } else {
         None
     };

src/controllers/krate/publish.rs

@@ -344,7 +344,7 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
 
         // To avoid race conditions, we try to insert
         // first so we know whether to add an owner
-        let krate = match persist.async_create(conn, user.id).await.optional()? {
+        let krate = match persist.create(conn, user.id).await.optional()? {
             Some(krate) => krate,
             None => persist.update(conn).await?,
         };
@@ -480,7 +480,7 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
             return Err(bad_request(format!("The following category slugs are not currently supported on crates.io: {}\n\nSee https://{}/category_slugs for a list of supported slugs.", unknown_categories, domain)));
         }
 
-        let top_versions = krate.async_top_versions(conn).await?;
+        let top_versions = krate.top_versions(conn).await?;
 
         let downloads: i64 = crate_downloads::table.select(crate_downloads::downloads)
             .filter(crate_downloads::crate_id.eq(krate.id))

src/models/krate.rs

@@ -126,7 +126,7 @@ impl<'a> NewCrate<'a> {
             .await
     }
 
-    pub async fn async_create(
+    pub async fn create(
         &self,
         conn: &mut AsyncPgConnection,
         user_id: i32,
@@ -161,32 +161,6 @@ impl<'a> NewCrate<'a> {
         })
         .await
     }
-
-    pub fn create(&self, conn: &mut impl Conn, user_id: i32) -> QueryResult<Crate> {
-        use diesel::RunQueryDsl;
-
-        conn.transaction(|conn| {
-            let krate: Crate = diesel::insert_into(crates::table)
-                .values(self)
-                .on_conflict_do_nothing()
-                .returning(Crate::as_returning())
-                .get_result(conn)?;
-
-            let owner = CrateOwner {
-                crate_id: krate.id,
-                owner_id: user_id,
-                created_by: user_id,
-                owner_kind: OwnerKind::User,
-                email_notifications: true,
-            };
-
-            diesel::insert_into(crate_owners::table)
-                .values(&owner)
-                .execute(conn)?;
-
-            Ok(krate)
-        })
-    }
 }
 
 impl Crate {
@@ -382,7 +356,7 @@ impl Crate {
     /// Return both the newest (most recently updated) and
     /// highest version (in semver order) for the current crate,
     /// where all top versions are not yanked.
-    pub async fn async_top_versions(
+    pub async fn top_versions(
         &self,
         conn: &mut AsyncPgConnection,
     ) -> QueryResult<TopVersions> {
@@ -397,20 +371,6 @@ impl Crate {
         ))
     }
 
-    /// Return both the newest (most recently updated) and
-    /// highest version (in semver order) for the current crate,
-    /// where all top versions are not yanked.
-    pub fn top_versions(&self, conn: &mut impl Conn) -> QueryResult<TopVersions> {
-        use diesel::RunQueryDsl;
-
-        Ok(TopVersions::from_date_version_pairs(
-            Version::belonging_to(self)
-                .filter(versions::yanked.eq(false))
-                .select((versions::created_at, versions::num))
-                .load(conn)?,
-        ))
-    }
-
     pub async fn async_owners(&self, conn: &mut AsyncPgConnection) -> QueryResult<Vec<Owner>> {
         use diesel_async::RunQueryDsl;
 

src/tests/builders/krate.rs

@@ -122,7 +122,7 @@ impl<'a> CrateBuilder<'a> {
         use diesel::{insert_into, select, update};
         use diesel_async::RunQueryDsl;
 
-        let mut krate = self.krate.async_create(connection, self.owner_id).await?;
+        let mut krate = self.krate.create(connection, self.owner_id).await?;
 
         // Since we are using `NewCrate`, we can't set all the
         // crate properties in a single DB call.

src/worker/jobs/downloads/update_metadata.rs

@@ -124,7 +124,7 @@ mod tests {
             name: "foo",
             ..Default::default()
         }
-        .async_create(conn, user_id)
+        .create(conn, user_id)
         .await
         .unwrap();