Skip to content

Commit

Permalink
meta: Adopt forked prost crates (#1005)
Browse files Browse the repository at this point in the history
* meta: Adopt forked prost crates

Addresses the lack of a release of the upstream crates for a multitude
of reasons by adopting forked crates on crates.io based off of latest
master. Ideally this is a stop-gap solution until prost itself is
updated properly.

Fixes #966

Signed-off-by: xla <self@xla.is>

* tendermint: Fix documentation reference

Signed-off-by: xla <self@xla.is>
  • Loading branch information
xla committed Oct 6, 2021
1 parent aee72bd commit e3e4c88
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion abci/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ std = [

[dependencies]
bytes = "1.0"
prost = "0.7"
prost = { package = "informalsystems-prost", version = "0.8.1" }
tendermint-proto = { version = "0.22.0", path = "../proto" }
tracing = "0.1"
flex-error = { version = "0.4.1", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions p2p/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ eyre = "0.6"
flume = "0.10.7"
hkdf = "0.10.0"
merlin = "2"
prost = "0.7"
prost = { package = "informalsystems-prost", version = "0.8.1" }
rand_core = { version = "0.5", features = ["std"] }
sha2 = "0.9"
subtle = "2"
Expand All @@ -53,4 +53,4 @@ tendermint-proto = { path = "../proto", version = "0.22.0" }
tendermint-std-ext = { path = "../std-ext", version = "0.22.0" }

# optional dependencies
prost-derive = { version = "0.7", optional = true }
prost-derive = { package = "informalsystems-prost-derive", version = "0.8.1", optional = true }
4 changes: 2 additions & 2 deletions proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ description = """
all-features = true

[dependencies]
prost = "0.7"
prost-types = "0.7"
prost = { package = "informalsystems-prost", version = "0.8.1" }
prost-types = { package = "informalsystems-prost-types", version = "0.8.1" }
bytes = "1.0"
serde = { version = "1.0", features = ["derive"] }
subtle-encoding = "0.5"
Expand Down
4 changes: 2 additions & 2 deletions tendermint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ ed25519-dalek = { version = "1", features = ["serde"] }
futures = "0.3"
num-traits = "0.2"
once_cell = "1.3"
prost = "0.7"
prost-types = "0.7"
prost = { package = "informalsystems-prost", version = "0.8.1" }
prost-types = { package = "informalsystems-prost-types", version = "0.8.1" }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
serde_bytes = "0.11"
Expand Down
2 changes: 1 addition & 1 deletion tendermint/src/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl From<Time> for Timestamp {
}

impl Time {
/// Get the [`UNIX_EPOCH`] time ("1970-01-01 00:00:00 UTC") as a [`Time`]
/// Get the unix epoch ("1970-01-01 00:00:00 UTC") as a [`Time`]
pub fn unix_epoch() -> Self {
Time(Utc.timestamp(0, 0))
}
Expand Down

0 comments on commit e3e4c88

Please sign in to comment.