Merge pull request #9746 from Turbo87/typosquat-utils

typosquat/test_util: Simplify `crate_and_version()` by using `CrateBuilder`

Author: Turbo87

src/typosquat/database.rs

@@ -183,8 +183,8 @@ mod tests {
 
         // Let's set up a team that owns both b and c, but not a.
         let not_the_a_team = faker::team(&mut conn, "org", "team")?;
-        faker::add_crate_to_team(&mut conn, &user_b, &top_b.0, &not_the_a_team)?;
-        faker::add_crate_to_team(&mut conn, &user_b, &not_top_c.0, &not_the_a_team)?;
+        faker::add_crate_to_team(&mut conn, &user_b, &top_b, &not_the_a_team)?;
+        faker::add_crate_to_team(&mut conn, &user_b, &not_top_c, &not_the_a_team)?;
 
         let top_crates = TopCrates::new(&mut conn, 2)?;
 

src/typosquat/test_util.rs

@@ -2,14 +2,14 @@ use diesel::{prelude::*, PgConnection};
 
 use crate::tests::util::github::next_gh_id;
 use crate::{
-    models::{
-        Crate, CrateOwner, NewCrate, NewTeam, NewUser, NewVersion, Owner, OwnerKind, User, Version,
-    },
-    schema::{crate_downloads, crate_owners, users},
+    models::{Crate, CrateOwner, NewTeam, NewUser, Owner, OwnerKind, User},
+    schema::{crate_owners, users},
 };
 
 pub mod faker {
     use super::*;
+    use crate::tests::builders::CrateBuilder;
+    use anyhow::anyhow;
 
     pub fn add_crate_to_team(
         conn: &mut PgConnection,
@@ -38,27 +38,13 @@ pub mod faker {
         description: &str,
         user: &User,
         downloads: i32,
-    ) -> anyhow::Result<(Crate, Version)> {
-        let krate = NewCrate {
-            name,
-            description: Some(description),
-            ..Default::default()
-        }
-        .create(conn, user.id)?;
-
-        diesel::update(crate_downloads::table)
-            .filter(crate_downloads::crate_id.eq(krate.id))
-            .set(crate_downloads::downloads.eq(downloads as i64))
-            .execute(conn)?;
-
-        let version = NewVersion::builder(krate.id, "1.0.0")
-            .published_by(user.id)
-            .checksum("0000000000000000000000000000000000000000000000000000000000000000")
-            .build()
-            .save(conn, "[email protected]")
-            .unwrap();
-
-        Ok((krate, version))
+    ) -> anyhow::Result<Crate> {
+        CrateBuilder::new(name, user.id)
+            .description(description)
+            .downloads(downloads)
+            .version("1.0.0")
+            .build(conn)
+            .map_err(|err| anyhow!(err.to_string()))
     }
 
     pub fn team(conn: &mut PgConnection, org: &str, team: &str) -> anyhow::Result<Owner> {

src/worker/jobs/typosquat.rs

@@ -141,14 +141,14 @@ mod tests {
 
         // Now we'll create new crates: one problematic, one not so.
         let other_user = faker::user(&mut conn, "b")?;
-        let (angel, _version) = faker::crate_and_version(
+        let angel = faker::crate_and_version(
             &mut conn,
             "innocent-crate",
             "I'm just a simple, innocent crate",
             &other_user,
             0,
         )?;
-        let (demon, _version) = faker::crate_and_version(
+        let demon = faker::crate_and_version(
             &mut conn,
             "mycrate",
             "I'm even more innocent, obviously",