Skip to content

Update ServiceRuntime proxy in Rust to the current Exonum revision [ECR-3698] #1179

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 5 commits into from
Oct 24, 2019
Merged

Update ServiceRuntime proxy in Rust to the current Exonum revision [ECR-3698] #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da2320c
Update Java Runtime to revision 47114e3 of Core
Oct 23, 2019
d1fe066
Fix import in build.rs
Oct 23, 2019
490b848
Remove unneeded import
Oct 24, 2019
fd35eb4
Slightly change variables naming
Oct 24, 2019
c2eb9e8
Fix comments
Oct 24, 2019
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
140 changes: 92 additions & 48 deletions exonum-java-binding/core/rust/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions exonum-java-binding/core/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ invocation = ["jni/invocation"]
[dependencies]
exonum = { version = "0.12", features = ["rocksdb_snappy", "rocksdb_lz4", "rocksdb_zlib", "rocksdb_bzip2"] }
exonum-derive = "0.12"
exonum-proto = "0.12"
exonum-time = "0.12"
exonum-testkit = "0.12"
exonum-cli = "0.12"
Expand Down Expand Up @@ -47,9 +48,10 @@ rpath = true

# FIXME: using git dependency until new Exonum with dynamic services will be released
[patch.crates-io]
exonum = { git = "https://github.com/exonum/exonum", rev = "270def3" }
exonum-testkit = { git = "https://github.com/exonum/exonum", rev = "270def3" }
exonum-time = { git = "https://github.com/exonum/exonum", rev = "270def3" }
exonum-build = { git = "https://github.com/exonum/exonum", rev = "270def3" }
exonum-derive = { git = "https://github.com/exonum/exonum", rev = "270def3" }
exonum-cli = { git = "https://github.com/exonum/exonum", rev = "270def3" }
exonum = { git = "https://github.com/exonum/exonum", rev = "47114e3" }
exonum-testkit = { git = "https://github.com/exonum/exonum", rev = "47114e3" }
exonum-time = { git = "https://github.com/exonum/exonum", rev = "47114e3" }
exonum-build = { git = "https://github.com/exonum/exonum", rev = "47114e3" }
exonum-derive = { git = "https://github.com/exonum/exonum", rev = "47114e3" }
exonum-cli = { git = "https://github.com/exonum/exonum", rev = "47114e3" }
exonum-proto = { git = "https://github.com/exonum/exonum", rev = "47114e3" }
8 changes: 6 additions & 2 deletions exonum-java-binding/core/rust/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
extern crate exonum_build;

use exonum_build::protobuf_generate;
use exonum_build::ProtobufGenerator;

use std::env::var_os;

fn main() {
Expand All @@ -12,5 +13,8 @@ fn main() {
println!("cargo:rustc-link-lib=dylib=c++");
}

protobuf_generate("../src/main/proto", &["src/proto"], "protobuf_mod.rs");
ProtobufGenerator::with_mod_name("protobuf_mod.rs")
.with_input_dir("../src/main/proto")
.add_path("../src/main/proto")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do not even ask me about what is going on here and why we need two identical arguments for different methods.

.generate();
}
Loading