clean up

Author: elpiel

sentry/src/db.rs

@@ -185,10 +185,6 @@ pub mod tests_postgres {
         pub fn new(name: String, pool: DbPool) -> Self {
             Self { name, pool }
         }
-
-        pub fn get_pool(&self) -> deadpool_postgres::Pool<NoTls> {
-            self.pool.clone()
-        }
     }
 
     impl Deref for Database {

sentry/src/db/campaign.rs

@@ -61,18 +61,18 @@ mod test {
     async fn it_inserts_and_fetches_campaign() {
         let database = DATABASE_POOL.get().await.expect("Should get a DB pool");
 
-        setup_test_migrations(database.get_pool())
+        setup_test_migrations(database.pool.clone())
             .await
             .expect("Migrations should succeed");
 
         let campaign_for_testing = DUMMY_CAMPAIGN.clone();
-        let is_inserted = insert_campaign(&database.get_pool(), &campaign_for_testing)
+        let is_inserted = insert_campaign(&database.pool, &campaign_for_testing)
             .await
             .expect("Should succeed");
 
         assert!(is_inserted);
 
-        let fetched_campaign = fetch_campaign(database.get_pool(), &campaign_for_testing)
+        let fetched_campaign = fetch_campaign(database.pool.clone(), &campaign_for_testing)
             .await
             .expect("Should fetch successfully");
 

sentry/src/db/spendable.rs

@@ -62,7 +62,7 @@ mod test {
     async fn it_inserts_and_fetches_spendable() {
         let database = DATABASE_POOL.get().await.expect("Should get a DB pool");
 
-        setup_test_migrations(database.get_pool())
+        setup_test_migrations(database.pool.clone())
             .await
             .expect("Migrations should succeed");
 
@@ -74,14 +74,14 @@ mod test {
                 still_on_create2: UnifiedNum::from(500_000),
             },
         };
-        let is_inserted = insert_spendable(database.get_pool(), &spendable)
+        let is_inserted = insert_spendable(database.pool.clone(), &spendable)
             .await
             .expect("Should succeed");
 
         assert!(is_inserted);
 
         let fetched_spendable = fetch_spendable(
-            database.get_pool(),
+            database.pool.clone(),
             &spendable.spender,
             &spendable.channel.id(),
         )