Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Sergey/prost bump version to 0 10 #3531

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
May 5, 2022
Merged

Sergey/prost bump version to 0 10 #3531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
453802b
bumped, WIP
soleinik-figment May 3, 2022
417425c
2985: bumping up tonic/tonic-build:v0.7.1, prost/prost_types:v0.10.1
soleinik-figment May 3, 2022
4ae6303
there is no more tonic_build option to fmt generated code
soleinik-figment May 3, 2022
063995f
Merge branch 'graphprotocol:master' into sergey/prost_bump_version_to…
soleinik-figment May 4, 2022
729bff3
resolving merge conflicts
soleinik-figment May 5, 2022
9af7d7f
Merge branch 'sergey/prost_bump_version_to_0_10' of github.com:solein…
soleinik-figment May 5, 2022
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
283 changes: 210 additions & 73 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions chain/ethereum/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ graph = { path = "../../graph" }
lazy_static = "1.2.0"
mockall = "0.9.1"
serde = "1.0"
prost = "0.8"
prost-types = "0.8"
prost = "0.10.1"
prost-types = "0.10.1"
dirs-next = "2.0"
anyhow = "1.0"
tiny-keccak = "1.5.0"
Expand All @@ -31,4 +31,4 @@ test-store = { path = "../../store/test-store" }
base64 = "0.13.0"

[build-dependencies]
tonic-build = "0.5.1"
tonic-build = { version = "0.7.1", features = ["prost"] }
2 changes: 1 addition & 1 deletion chain/ethereum/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
fn main() {
println!("cargo:rerun-if-changed=proto");

tonic_build::configure()
.out_dir("src/protobuf")
.format(true)
.compile(&["proto/codec.proto"], &["proto"])
.expect("Failed to compile Firehose Ethereum proto(s)");
}
1 change: 1 addition & 0 deletions chain/ethereum/src/codec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#[rustfmt::skip]
#[path = "protobuf/sf.ethereum.codec.v1.rs"]
mod pbcodec;

Expand Down
339 changes: 169 additions & 170 deletions chain/ethereum/src/protobuf/sf.ethereum.codec.v1.rs
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions chain/near/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ version = "0.26.0"
edition = "2021"

[build-dependencies]
tonic-build = "0.5.1"
tonic-build = { version = "0.7.1", features = ["prost"] }

[dependencies]
base64 = "0.13"
graph = { path = "../../graph" }
prost = "0.8.0"
prost-types = "0.8.0"
prost = "0.10.1"
prost-types = "0.10.1"
serde = "1.0"

graph-runtime-wasm = { path = "../../runtime/wasm" }
Expand Down
1 change: 0 additions & 1 deletion chain/near/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ fn main() {
println!("cargo:rerun-if-changed=proto");
tonic_build::configure()
.out_dir("src/protobuf")
.format(true)
.compile(&["proto/codec.proto"], &["proto"])
.expect("Failed to compile Firehose NEAR proto(s)");
}
1 change: 1 addition & 0 deletions chain/near/src/codec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#[rustfmt::skip]
#[path = "protobuf/sf.near.codec.v1.rs"]
pub mod pbcodec;

Expand Down
Loading