Skip to content

Commit 9e5001f

Browse files
committed
Merge branch 'main' of github.com:juspay/hyperswitch into pref/pool
2 parents 0cc7c35 + 0553587 commit 9e5001f

File tree

30 files changed

+113
-182
lines changed

30 files changed

+113
-182
lines changed

Cargo.lock

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

crates/api_models/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ connector_choice_bcompat = []
1414
errors = ["dep:actix-web", "dep:reqwest"]
1515
backwards_compatibility = ["connector_choice_bcompat"]
1616
connector_choice_mca_id = ["euclid/connector_choice_mca_id"]
17-
dummy_connector = ["common_enums/dummy_connector", "euclid/dummy_connector"]
17+
dummy_connector = ["euclid/dummy_connector"]
1818
detailed_errors = []
1919
payouts = []
2020

@@ -30,7 +30,6 @@ strum = { version = "0.24.1", features = ["derive"] }
3030
time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] }
3131
url = { version = "2.4.0", features = ["serde"] }
3232
utoipa = { version = "3.3.0", features = ["preserve_order"] }
33-
thiserror = "1.0.40"
3433

3534
# First party crates
3635
cards = { version = "0.1.0", path = "../cards" }

crates/common_enums/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,11 @@ rust-version.workspace = true
77
readme = "README.md"
88
license.workspace = true
99

10-
[features]
11-
dummy_connector = []
12-
1310
[dependencies]
1411
diesel = { version = "2.1.0", features = ["postgres"] }
1512
serde = { version = "1.0.160", features = ["derive"] }
1613
serde_json = "1.0.96"
1714
strum = { version = "0.25", features = ["derive"] }
18-
time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] }
1915
utoipa = { version = "3.3.0", features = ["preserve_order"] }
2016

2117
# First party crates

crates/common_utils/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ http = "0.2.9"
2323
md5 = "0.7.0"
2424
nanoid = "0.4.0"
2525
once_cell = "1.18.0"
26+
phonenumber = "0.3.3"
2627
quick-xml = { version = "0.28.2", features = ["serialize"] }
2728
rand = "0.8.5"
2829
regex = "1.8.4"
@@ -37,12 +38,11 @@ strum = { version = "0.24.1", features = ["derive"] }
3738
thiserror = "1.0.40"
3839
time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] }
3940
tokio = { version = "1.28.2", features = ["macros", "rt-multi-thread"], optional = true }
40-
phonenumber = "0.3.3"
4141

4242
# First party crates
43+
common_enums = { version = "0.1.0", path = "../common_enums" }
4344
masking = { version = "0.1.0", path = "../masking" }
4445
router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra_implicit_fields", "log_custom_entries_to_extra"], optional = true }
45-
common_enums = { version = "0.1.0", path = "../common_enums" }
4646

4747
[target.'cfg(not(target_os = "windows"))'.dependencies]
4848
signal-hook-tokio = { version = "0.3.1", features = ["futures-v0_3"], optional = true }

crates/data_models/Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,21 @@ readme = "README.md"
88
license.workspace = true
99

1010
[features]
11-
default = ["olap", "oltp"]
12-
oltp = []
11+
default = ["olap"]
1312
olap = []
1413

1514
[dependencies]
1615
# First party deps
1716
api_models = { version = "0.1.0", path = "../api_models" }
18-
masking = { version = "0.1.0", path = "../masking" }
1917
common_enums = { version = "0.1.0", path = "../common_enums" }
2018
common_utils = { version = "0.1.0", path = "../common_utils" }
19+
masking = { version = "0.1.0", path = "../masking" }
2120

2221

2322
# Third party deps
2423
async-trait = "0.1.68"
2524
error-stack = "0.3.1"
2625
serde = { version = "1.0.163", features = ["derive"] }
2726
serde_json = "1.0.96"
28-
strum = { version = "0.25", features = [ "derive" ] }
2927
thiserror = "1.0.40"
3028
time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] }

crates/diesel_models/Cargo.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,10 @@ license.workspace = true
99

1010
[features]
1111
default = ["kv_store"]
12-
email = ["external_services/email", "dep:aws-config"]
13-
kms = ["external_services/kms", "dep:aws-config"]
1412
kv_store = []
15-
s3 = ["dep:aws-sdk-s3", "dep:aws-config"]
1613

1714
[dependencies]
1815
async-bb8-diesel = { git = "https://github.com/jarnura/async-bb8-diesel", rev = "53b4ab901aab7635c8215fd1c2d542c8db443094" }
19-
aws-config = { version = "0.55.3", optional = true }
20-
aws-sdk-s3 = { version = "0.28.0", optional = true }
2116
diesel = { version = "2.1.0", features = ["postgres", "serde_json", "time", "64-column-tables"] }
2217
error-stack = "0.3.1"
2318
frunk = "0.4.1"
@@ -31,7 +26,6 @@ time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] }
3126
# First party crates
3227
common_enums = { path = "../common_enums" }
3328
common_utils = { version = "0.1.0", path = "../common_utils" }
34-
external_services = { version = "0.1.0", path = "../external_services" }
3529
masking = { version = "0.1.0", path = "../masking" }
3630
router_derive = { version = "0.1.0", path = "../router_derive" }
3731
router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra_implicit_fields", "log_custom_entries_to_extra"] }

crates/drainer/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ readme = "README.md"
88
license.workspace = true
99

1010
[features]
11-
release = ["kms","vergen"]
11+
release = ["kms", "vergen"]
1212
kms = ["external_services/kms"]
1313
vergen = ["router_env/vergen"]
1414

@@ -28,11 +28,11 @@ tokio = { version = "1.28.2", features = ["macros", "rt-multi-thread"] }
2828

2929
# First Party Crates
3030
common_utils = { version = "0.1.0", path = "../common_utils", features = ["signals"] }
31+
diesel_models = { version = "0.1.0", path = "../diesel_models", features = ["kv_store"] }
3132
external_services = { version = "0.1.0", path = "../external_services" }
3233
masking = { version = "0.1.0", path = "../masking" }
3334
redis_interface = { version = "0.1.0", path = "../redis_interface" }
3435
router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra_implicit_fields", "log_custom_entries_to_extra"] }
35-
diesel_models = { version = "0.1.0", path = "../diesel_models", features = ["kv_store"] }
3636

3737
[build-dependencies]
3838
router_env = { version = "0.1.0", path = "../router_env", default-features = false }

0 commit comments

Comments
 (0)