Merge pull request #399 from AdExNetwork/replace-bb8-with-deadpool

replace bb8 & update test pool
AmbireTech · May 10, 2021 · e0fe4f6 · e0fe4f6
2 parents ce122e1 + cf55867
commit e0fe4f6
Show file tree

Hide file tree

Showing 16 changed files with 310 additions and 308 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/primitives/src/util/tests/prep_db.rs b/primitives/src/util/tests/prep_db.rs
@@ -253,6 +253,10 @@ pub mod postgres {
  .host(&POSTGRES_HOST)
  .port(*POSTGRES_PORT);
 
+ if let Some(db) = POSTGRES_DB.as_ref() {
+ config.dbname(db);
+ }
+
  let mgr_config = ManagerConfig {
  recycling_method: RecyclingMethod::Fast,
  };

diff --git a/sentry/Cargo.toml b/sentry/Cargo.toml
@@ -23,8 +23,9 @@ hyper = { version = "0.14", features = ["stream", "runtime", "http1", "server"]
 regex = "1"
 # Database
 redis = { version = "0.19", features = ["aio", "tokio-comp"] }
-bb8 = "0.7"
-bb8-postgres = { version = "0.7", features = ["with-chrono-0_4", "with-serde_json-1"] }
+deadpool = "0.7.0"
+deadpool-postgres = "0.7.0"
+tokio-postgres = { version = "0.7.0", features = ["with-chrono-0_4", "with-serde_json-1"] }
 
 # Migrations
 migrant_lib = { version = "^0.32", features = ["d-postgres"] }
@@ -37,10 +38,4 @@ serde_urlencoded = "^0.7"
 # Other
 lazy_static = "1.4.0"
 thiserror = "^1.0"
-tokio-postgres = { version = "0.7.0", features = ["with-chrono-0_4", "with-serde_json-1"] }
-
-[dev-dependencies]
-# todo: Replace `bb8` once we update all places.
-deadpool = "0.7.0"
-deadpool-postgres = "0.7.0"
 once_cell = "1.5.2"