primitves & sentry:

- primitives - improve tests & test-util modules
- sentry - db - postgres Pool uses default `max_size`

Author: elpiel

primitives/src/lib.rs

@@ -46,7 +46,7 @@ pub mod sentry;
 pub mod spender;
 pub mod supermarket;
 pub mod targeting;
-#[cfg(feature = "test-util")]
+#[cfg(any(test, feature = "test-util"))]
 #[cfg_attr(docsrs, doc(cfg(feature = "test-util")))]
 pub mod test_util;
 pub mod unified_num;

primitives/src/sentry.rs

@@ -1129,15 +1129,55 @@ mod postgres {
             }
         }
     }
+
+    #[cfg(test)]
+    mod test {
+        use chrono::{TimeZone, Utc};
+
+        use crate::{postgres::POSTGRES_POOL, sentry::DateHour};
+
+        #[tokio::test]
+        pub async fn datehour_from_to_sql() {
+            let client = POSTGRES_POOL.get().await.unwrap();
+            let sql_type = "TIMESTAMPTZ";
+
+            let example_datehour = DateHour::<Utc>::from_ymdh(2021, 1, 1, 1);
+            let expected_datehour = DateHour::try_from(Utc.ymd(2021, 1, 1).and_hms(1, 0, 0))
+                .expect("Should get DateHour");
+            assert_eq!(
+                example_datehour, expected_datehour,
+                "Example and expected datehour must be the same"
+            );
+
+            // from SQL
+            let actual_datehour: DateHour<Utc> = client
+                .query_one(
+                    &*format!("SELECT '{}'::{}", example_datehour.to_datetime(), sql_type),
+                    &[],
+                )
+                .await
+                .unwrap()
+                .get(0);
+
+            assert_eq!(&expected_datehour, &actual_datehour);
+
+            // to SQL
+            let actual_datehour: DateHour<Utc> = client
+                .query_one(&*format!("SELECT $1::{}", sql_type), &[&example_datehour])
+                .await
+                .unwrap()
+                .get(0);
+
+            assert_eq!(&expected_datehour, &actual_datehour);
+        }
+    }
 }
 
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::{
-        postgres::POSTGRES_POOL,
-        test_util::{DUMMY_IPFS, PUBLISHER},
-    };
+    use crate::test_util::{DUMMY_IPFS, PUBLISHER};
+
     use serde_json::{json, Value};
 
     #[test]
@@ -1243,39 +1283,4 @@ mod test {
             "UTC+0 value should be equal to UTC+2"
         );
     }
-
-    #[tokio::test]
-    pub async fn datehour_from_to_sql() {
-        let client = POSTGRES_POOL.get().await.unwrap();
-        let sql_type = "TIMESTAMPTZ";
-
-        let example_datehour = DateHour::<Utc>::from_ymdh(2021, 1, 1, 1);
-        let expected_datehour =
-            DateHour::try_from(Utc.ymd(2021, 1, 1).and_hms(1, 0, 0)).expect("Should get DateHour");
-        assert_eq!(
-            example_datehour, expected_datehour,
-            "Example and expected datehour must be the same"
-        );
-
-        // from SQL
-        let actual_datehour: DateHour<Utc> = client
-            .query_one(
-                &*format!("SELECT '{}'::{}", example_datehour.to_datetime(), sql_type),
-                &[],
-            )
-            .await
-            .unwrap()
-            .get(0);
-
-        assert_eq!(&expected_datehour, &actual_datehour);
-
-        // to SQL
-        let actual_datehour: DateHour<Utc> = client
-            .query_one(&*format!("SELECT $1::{}", sql_type), &[&example_datehour])
-            .await
-            .unwrap()
-            .get(0);
-
-        assert_eq!(&expected_datehour, &actual_datehour);
-    }
 }

sentry/src/db.rs

@@ -53,8 +53,8 @@ pub async fn redis_connection(
     client.get_multiplexed_async_connection().await
 }
 
+/// Uses the default `max_size` of the `PoolConfig` which is `num_cpus::get_physical() * 4`
 pub async fn postgres_connection(
-    max_size: usize,
     config: tokio_postgres::Config,
 ) -> Result<DbPool, deadpool_postgres::BuildError> {
     let mgr_config = ManagerConfig {
@@ -63,7 +63,9 @@ pub async fn postgres_connection(
 
     let manager = Manager::from_config(config, NoTls, mgr_config);
 
-    DbPool::builder(manager).max_size(max_size).build()
+    // use default max_size which is set by PoolConfig::default()
+    // num_cpus::get_physical() * 4
+    DbPool::builder(manager).build()
 }
 
 /// Sets the migrations using the `POSTGRES_*` environment variables
@@ -138,7 +140,7 @@ pub fn setup_migrations(environment: Environment) {
         .expect("Reloading config for migration failed");
 }
 
-#[cfg(feature = "test-util")]
+#[cfg(any(test, feature = "test-util"))]
 #[cfg_attr(docsrs, doc(cfg(feature = "test-util")))]
 pub mod tests_postgres {
     use std::{
@@ -230,7 +232,7 @@ pub mod tests_postgres {
     #[derive(Debug, Error)]
     pub enum Error {
         #[error(transparent)]
-        Build(#[from] deadpool::managed::BuildError<tokio_postgres::Error>),
+        Build(#[from] deadpool_postgres::BuildError),
         #[error(transparent)]
         Pool(#[from] PoolError),
     }
@@ -480,7 +482,7 @@ pub mod tests_postgres {
     }
 }
 
-#[cfg(feature = "test-util")]
+#[cfg(any(test, feature = "test-util"))]
 #[cfg_attr(docsrs, doc(cfg(feature = "test-util")))]
 pub mod redis_pool {
 

sentry/src/main.rs

@@ -134,7 +134,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     });
 
     // use the environmental variables to setup the Postgres connection
-    let postgres = match postgres_connection(420, POSTGRES_CONFIG.clone()).await {
+    let postgres = match postgres_connection(POSTGRES_CONFIG.clone()).await {
         Ok(pool) => pool,
         Err(build_err) => panic!("Failed to build postgres database pool: {build_err}"),
     };

test_harness/src/lib.rs

@@ -2800,7 +2800,7 @@ pub mod run {
             config
         };
 
-        let postgres = postgres_connection(42, postgres_config).await?;
+        let postgres = postgres_connection(postgres_config).await?;
         let mut redis = redis_connection(validator.sentry_config.redis_url.clone()).await?;
 
         Manager::flush_db(&mut redis)