Skip to content

Commit 1eee925

Browse files
committed
Merge branch 'update-dependencies' into aip-61-adex-v5
2 parents ca6c966 + 09048dd commit 1eee925

File tree

8 files changed

+285
-415
lines changed

8 files changed

+285
-415
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ members = [
1111
"test_harness",
1212
]
1313

14-
[patch.crates-io]
15-
postgres-types = { git = "https://github.com/elpiel/rust-postgres", branch = "boxed-dyn-ToSql"}
14+
# [patch.crates-io]
15+
# postgres-types = { git = "https://github.com/elpiel/rust-postgres", branch = "boxed-dyn-ToSql"}

adapter/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ thiserror = "1"
3131

3232
# Time handling
3333
chrono = "0.4"
34-
serde = { version = "^1.0", features = ["derive"] }
34+
serde = { version = "1.0", features = ["derive"] }
3535
serde_json = "1.0"
3636
hex = "0.4"
3737
base64 = "0.13"
38-
once_cell = "^1.8"
38+
once_cell = "1.8"
3939
# Macro for easier derive of Display & FromStr
40-
parse-display = "^0.5.0"
40+
parse-display = "0.5"
4141

4242
[dev-dependencies]
43-
byteorder = "^1.4"
44-
tokio = { version = "^1", features = ["macros", "rt-multi-thread"] }
43+
byteorder = "1.4"
44+
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
4545
pretty_assertions = "1"

adview-manager/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ name = "adview-manager"
55
version = "0.1.0"
66
license = "AGPL-3.0"
77

8+
[package.metadata.docs.rs]
9+
all-features = true
10+
rustdoc-args = ["--cfg", "docsrs"]
11+
812
[dependencies]
913
# Domain
1014
adex_primitives = { path = "../primitives", package = "primitives", features = ["test-util"] }
1115
chrono = "0.4"
1216
num-integer = "0.1"
1317
# (De)Serialization & Http requests
14-
serde = { version = "^1.0", features = ["derive"] }
15-
serde_json = "^1.0"
18+
serde = { version = "1", features = ["derive"] }
19+
serde_json = "1"
1620
reqwest = { version = "0.11", features = ["json"] }
17-
url = { version = "^2.1", features = ["serde"] }
21+
url = { version = "2", features = ["serde"] }
1822
# Logging
1923
log = "0.4"
2024
# Async
21-
async-std = "^1.8"
25+
async-std = "1"
2226
# Other
23-
once_cell = "^1.8"
24-
thiserror = "^1.0"
25-
rand = "^0.8"
26-
27-
[package.metadata.docs.rs]
28-
all-features = true
29-
rustdoc-args = ["--cfg", "docsrs"]
27+
once_cell = "1"
28+
thiserror = "1"
29+
rand = "0.8"

primitives/Cargo.toml

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ authors = [
1010
edition = "2021"
1111
license = "AGPL-3.0"
1212

13+
[package.metadata.docs.rs]
14+
all-features = true
15+
rustdoc-args = ["--cfg", "docsrs"]
16+
1317
[features]
1418
postgres = ["bytes", "tokio-postgres", "deadpool-postgres"]
1519
# Enables the testing utilities like addresses, dummy Campaigns, Validators, IPFSes, AdUnits, etc.
@@ -18,62 +22,53 @@ test-util = []
1822

1923
[dependencies]
2024
# (De)Serialization
21-
serde = { version = "^1.0", features = ['derive'] }
25+
serde = { version = "1.0", features = ["derive"] }
2226
serde_json = "1.0"
2327
# TODO: Remove once we change `ChannelId` Serialize impl
24-
serde-hex = "0.1.0"
25-
serde_millis = "0.1.1"
28+
serde-hex = "0.1"
29+
serde_millis = "0.1"
2630
# Used prefixes on field for targeting::Input, and `campaign::Active`
27-
serde_with = "1.9"
31+
serde_with = "1"
2832
# Configuration
2933
toml = "0.5"
3034
# Logging
31-
slog = { version = "^2.5.2", features = ["max_level_trace"] }
32-
slog-term = "^2.4.2"
33-
slog-async = "^2.3.0"
35+
slog = { version = "2", features = ["max_level_trace"] }
36+
slog-term = "2"
37+
slog-async = "2"
3438
# Domain
35-
thiserror = "^1.0"
39+
thiserror = "1"
3640
chrono = { version = "0.4", features = ["serde"] }
37-
# time = "0.1.42"
38-
uuid = { version = "0.8", features = ["v4"] }
41+
uuid = { version = "1", features = ["v4"] }
3942
# For encoding the Channel to a ChannelId
40-
ethabi = "14.0.0"
43+
ethabi = "17"
4144
# For the nonce U256
42-
ethereum-types = "0.11"
45+
ethereum-types = "0.13"
4346
# Macro for easier derive of Display & FromStr
44-
parse-display = "^0.5.0"
47+
parse-display = "0.5"
4548
# CID & multihash / multibase
4649
cid = "0.8"
4750
hex = "0.4"
48-
merkletree = "0.10.0"
49-
tiny-keccak = { version = "^2.0", features = ["keccak"] }
50-
url = { version = "=2.2", features = ["serde"] }
51+
merkletree = "0.10"
52+
tiny-keccak = { version = "2", features = ["keccak"] }
53+
url = { version = "2", features = ["serde"] }
5154
# Numbers - BigNum, Numbers, Traits and Derives
5255
num = { version = "0.4", features = ["serde", "num-bigint"] }
5356
num-traits = "0.2"
5457
num-derive = "0.3"
55-
# Fixtures
56-
rand = "^0.8"
5758
# postgres feature
58-
bytes = { version = "^1", optional = true }
59+
bytes = { version = "1", optional = true }
5960
tokio-postgres = { version = "0.7", optional = true, features = [
6061
"with-chrono-0_4",
6162
"with-serde_json-1",
6263
] }
6364
# testing FromSql & ToSql implementation of structs
6465
deadpool-postgres = { version = "0.10", optional = true }
6566

66-
# Futures
67-
futures = "0.3"
6867
async-trait = "0.1"
6968
# Other
70-
once_cell = "^1.8"
69+
once_cell = "1"
7170

7271
[dev-dependencies]
7372
pretty_assertions = "1"
7473
tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
75-
serde_qs = "^0.9"
76-
77-
[package.metadata.docs.rs]
78-
all-features = true
79-
rustdoc-args = ["--cfg", "docsrs"]
74+
serde_qs = "0.9"

sentry/Cargo.toml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ test-util = ["primitives/test-util", "adapter/test-util", "dashmap"]
1515

1616
[dependencies]
1717
# Futures
18-
futures = "^0.3"
19-
async-std = "^1"
20-
async-trait = "^0.1"
18+
futures = "0.3"
19+
async-trait = "0.1"
2120
# Primitives
2221
primitives = { path = "../primitives", features = ["postgres", "test-util"] }
2322
adapter = { version = "0.2", path = "../adapter", features = ["test-util"] }
@@ -26,7 +25,7 @@ chrono = { version = "0.4", features = ["serde"] }
2625
dashmap = { version = "5", optional = true }
2726
hex = "0.4"
2827
# CLI
29-
clap = { version = "3.1", features = ["cargo"] }
28+
clap = { version = "3", features = ["cargo"] }
3029
# Server
3130
tokio = { version = "1", features = ["macros", "time", "rt-multi-thread"] }
3231
hyper = { version = "0.14", features = ["stream", "runtime", "http1", "server"] }
@@ -37,28 +36,28 @@ deadpool = "0.9"
3736
deadpool-postgres = "0.10"
3837
# Should be the same version as in `primitives` and `deadpool-postgres`!
3938
tokio-postgres = { version = "0.7", features = ["with-chrono-0_4", "with-serde_json-1"] }
40-
postgres-types = { version = "0.2.1", features = [
39+
postgres-types = { version = "0.2", features = [
4140
"derive",
4241
"with-chrono-0_4",
4342
"with-serde_json-1",
4443
"array-impls",
4544
] }
4645

4746
# Migrations
48-
migrant_lib = { version = "^0.32", features = ["d-postgres"] }
47+
migrant_lib = { version = "0.33", features = ["d-postgres"] }
4948
# Logger
50-
slog = { version = "^2.2.3", features = ["max_level_trace"] }
49+
slog = { version = "2", features = ["max_level_trace"] }
5150
# Deserialize values from Environment variables for the configuration
5251
envy = "0.4"
5352
# Serde
54-
serde = { version = "^1.0", features = ["derive"] }
55-
serde_json = "^1.0"
56-
serde_qs = "^0.9"
53+
serde = { version = "1", features = ["derive"] }
54+
serde_json = "1"
55+
serde_qs = "0.9"
5756
# Other
58-
thiserror = "^1.0"
59-
once_cell = "^1.5"
57+
thiserror = "1"
58+
once_cell = "1"
6059
# UA parsing for `/units-for-slot` route
61-
woothee = "^0.13"
60+
woothee = "0.13"
6261
# Making requests to the platform
6362
reqwest = { version = "0.11", features = ["json", "cookies"] }
6463

test_harness/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ reqwest = { version = "0.11", features = ["json"] }
2020
serde_json = { version = "1" }
2121

2222
slog = { version = "^2.2.3", features = ["max_level_trace"] }
23-
futures = "0.3"
2423

2524
subprocess = "0.2"
2625

@@ -29,4 +28,4 @@ tokio = { version = "1", features = ["rt-multi-thread", "macros", "time"] }
2928
# probably needed for Relayer calls
3029
# wiremock = "0.5"
3130
pretty_assertions = "^1.0"
32-
serde_qs = "0.9.2"
31+
serde_qs = "^0.9"

validator_worker/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,27 @@ num = "0.4"
2323
num-traits = "0.2"
2424
# To/From Hex
2525
hex = "0.4"
26-
byteorder = "^1.4"
26+
byteorder = "1.4"
2727
# Logging
28-
slog = { version = "^2.7", features = ["max_level_trace"] }
28+
slog = { version = "2", features = ["max_level_trace"] }
2929
# Futures
3030
futures = "0.3"
3131
# Concurrency
3232
tokio = { version = "1", features = ["time", "rt-multi-thread"] }
3333
# API client
3434
reqwest = { version = "0.11", features = ["json"] }
3535
# Other
36-
thiserror = "^1.0"
36+
thiserror = "1"
3737
# (De)Serialization
38-
serde = { version = "^1.0", features = ["derive"] }
39-
serde_json = "1.0"
40-
serde_qs = "0.9.2"
38+
serde = { version = "1", features = ["derive"] }
39+
serde_json = "1"
40+
serde_qs = "0.9"
4141
toml = "0.5"
4242
# CLI
43-
clap = { version = "3.1", features = ["cargo"] }
43+
clap = { version = "3", features = ["cargo"] }
4444

4545
[dev-dependencies]
46-
wiremock = "0.5.12"
46+
wiremock = "0.5"
4747

4848
[package.metadata.docs.rs]
4949
all-features = true

0 commit comments

Comments
 (0)