Skip to content

Commit e0fe4f6

Browse files
authored
Merge pull request #399 from AdExNetwork/replace-bb8-with-deadpool
replace bb8 & update test pool
2 parents ce122e1 + cf55867 commit e0fe4f6

16 files changed

+310
-308
lines changed

Cargo.lock

Lines changed: 0 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

primitives/src/util/tests/prep_db.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,10 @@ pub mod postgres {
253253
.host(&POSTGRES_HOST)
254254
.port(*POSTGRES_PORT);
255255

256+
if let Some(db) = POSTGRES_DB.as_ref() {
257+
config.dbname(db);
258+
}
259+
256260
let mgr_config = ManagerConfig {
257261
recycling_method: RecyclingMethod::Fast,
258262
};

sentry/Cargo.toml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ hyper = { version = "0.14", features = ["stream", "runtime", "http1", "server"]
2323
regex = "1"
2424
# Database
2525
redis = { version = "0.19", features = ["aio", "tokio-comp"] }
26-
bb8 = "0.7"
27-
bb8-postgres = { version = "0.7", features = ["with-chrono-0_4", "with-serde_json-1"] }
26+
deadpool = "0.7.0"
27+
deadpool-postgres = "0.7.0"
28+
tokio-postgres = { version = "0.7.0", features = ["with-chrono-0_4", "with-serde_json-1"] }
2829

2930
# Migrations
3031
migrant_lib = { version = "^0.32", features = ["d-postgres"] }
@@ -37,10 +38,4 @@ serde_urlencoded = "^0.7"
3738
# Other
3839
lazy_static = "1.4.0"
3940
thiserror = "^1.0"
40-
tokio-postgres = { version = "0.7.0", features = ["with-chrono-0_4", "with-serde_json-1"] }
41-
42-
[dev-dependencies]
43-
# todo: Replace `bb8` once we update all places.
44-
deadpool = "0.7.0"
45-
deadpool-postgres = "0.7.0"
4641
once_cell = "1.5.2"

0 commit comments

Comments
 (0)