Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: Unpin time dependency #1199

Merged
merged 5 commits into from
Sep 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changelog/unreleased/dependencies/1199-unpin-time-dep.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Unpin `time` dependency
([#1199](https://github.com/informalsystems/tendermint-rs/pull/1199))
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2021-11-10
toolchain: nightly-2022-09-18
override: true
- uses: actions-rs/cargo@v1
with:
Expand All @@ -162,7 +162,7 @@ jobs:
- name: Install grcov
run: |
rustup component add llvm-tools-preview
curl -L https://github.com/mozilla/grcov/releases/download/v0.8.7/grcov-x86_64-unknown-linux-gnu.tar.bz2 | tar jxf -
curl -L https://github.com/mozilla/grcov/releases/download/v0.8.11/grcov-x86_64-unknown-linux-gnu.tar.bz2 | tar jxf -
- name: Run grcov
run: |
./grcov . --source-dir . --binary-path ./target/debug/ --output-type lcov --output-path ./lcov.info --branch --ignore-not-existing
Expand Down
2 changes: 1 addition & 1 deletion light-client-verifier/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ tendermint = { version = "0.23.9", path = "../tendermint", default-features = fa

derive_more = { version = "0.99.5", default-features = false, features = ["display"] }
serde = { version = "1.0.106", default-features = false }
time = { version = "0.3.5", default-features = false }
time = { version = "0.3", default-features = false }
flex-error = { version = "0.4.4", default-features = false }

[dev-dependencies]
Expand Down
3 changes: 1 addition & 2 deletions light-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ serde_cbor = { version = "0.11.1", default-features = false, features = ["alloc"
serde_derive = { version = "1.0.106", default-features = false }
sled = { version = "0.34.3", optional = true, default-features = false }
static_assertions = { version = "1.1.0", default-features = false }
# TODO(thane): Remove restrictions once js-sys issue is resolved (causes the Substrate no_std check to fail)
time = { version = ">=0.3, <0.3.12", default-features = false, features = ["std"] }
time = { version = "0.3", default-features = false, features = ["std"] }
tokio = { version = "1.0", default-features = false, features = ["rt"], optional = true }
flex-error = { version = "0.4.4", default-features = false }

Expand Down
6 changes: 2 additions & 4 deletions pbt-gen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ description = """
default = ["time"]

[dependencies]
# TODO(thane): Remove restrictions once js-sys issue is resolved (causes the Substrate no_std check to fail)
time = { version = ">=0.3, <0.3.12", default-features = false, optional = true }
time = { version = "0.3", default-features = false, optional = true }
proptest = { version = "0.10.1", default-features = false, features = ["std"] }

[dev-dependencies]
# TODO(thane): Remove restrictions once js-sys issue is resolved (causes the Substrate no_std check to fail)
time = { version = ">=0.3, <0.3.12", features = ["macros"] }
time = { version = "0.3", features = ["macros"] }
3 changes: 1 addition & 2 deletions proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ serde_bytes = { version = "0.11", default-features = false, features = ["alloc"]
subtle-encoding = { version = "0.5", default-features = false, features = ["hex", "base64", "alloc"] }
num-traits = { version = "0.2", default-features = false }
num-derive = { version = "0.3", default-features = false }
# TODO(thane): Remove restrictions once js-sys issue is resolved (causes the Substrate no_std check to fail)
time = { version = ">=0.3, <0.3.12", default-features = false, features = ["macros", "parsing"] }
time = { version = "0.3", default-features = false, features = ["macros", "parsing"] }
flex-error = { version = "0.4.4", default-features = false }

[dev-dependencies]
Expand Down
3 changes: 1 addition & 2 deletions tendermint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ signature = { version = "1", default-features = false }
subtle = { version = "2", default-features = false }
subtle-encoding = { version = "0.5", default-features = false, features = ["bech32-preview"] }
tendermint-proto = { version = "0.23.9", default-features = false, path = "../proto" }
# TODO(thane): Remove restrictions once js-sys issue is resolved (causes the Substrate no_std check to fail)
time = { version = ">=0.3, <0.3.12", default-features = false, features = ["macros", "parsing"] }
time = { version = "0.3", default-features = false, features = ["macros", "parsing"] }
zeroize = { version = "1.1", default-features = false, features = ["zeroize_derive", "alloc"] }
flex-error = { version = "0.4.4", default-features = false }
k256 = { version = "0.11", optional = true, default-features = false, features = ["ecdsa", "sha256"] }
Expand Down
1 change: 0 additions & 1 deletion tendermint/src/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ mod tests {
let dts = vec![
datetime!(0000-12-31 23:59:59.999999999 UTC),
datetime!(0001-01-01 00:00:00.999999999 +00:00:01),
datetime!(9999-12-31 23:59:59 -00:00:01),
Date::from_calendar_date(-1, October, 9)
.unwrap()
.midnight()
Expand Down
3 changes: 1 addition & 2 deletions testgen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ ed25519-dalek = { version = "1", default-features = false }
gumdrop = { version = "0.8.0", default-features = false }
simple-error = { version = "0.2.1", default-features = false }
tempfile = { version = "3.1.0", default-features = false }
# TODO(thane): Remove restrictions once js-sys issue is resolved (causes the Substrate no_std check to fail)
time = { package = "time", version = ">=0.3, <0.3.12", default-features = false, features = ["std"] }
time = { package = "time", version = "0.3", default-features = false, features = ["std"] }

[[bin]]
name = "tendermint-testgen"
Expand Down