mii/merkle.rs
1
0
Fork 0
mirror of https://github.com/mii443/merkle.rs.git synced 2025-08-22 16:05:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update protobuf to v0.3.3

Browse Source
This commit is contained in:
Romain Ruetschi
2020-07-09 23:24:33 +02:00
parent 3bacb95438
commit 7ef91b07d9
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@
## Changed ## Changed
- Update to Rust 2018 ([@romac](https://github.com/romac)) - Update to Rust 2018 ([@romac](https://github.com/romac))
- Update criterion to v0.3.3 ([@romac](https://github.com/romac)) - Update criterion to v0.3.3 ([@romac](https://github.com/romac))
- Update protobuf to v3.12.3 ([@romac](https://github.com/romac))
## [1.11.0](https://github.com/SpinResearch/merkle.rs/compare/1.10.0...1.11.0) - 2019-07-23 ## [1.11.0](https://github.com/SpinResearch/merkle.rs/compare/1.10.0...1.11.0) - 2019-07-23

18
Cargo.toml
View File

@ -32,20 +32,20 @@ name = "proof"
harness = false harness = false
[dependencies] [dependencies]
ring = "^0.16.1" ring = "0.16.15"
protobuf = { version = "^2.8.0", optional = true } protobuf = { version = "2.16.2", optional = true }
serde = { version = "^1.0.97", optional = true } serde = { version = "1.0.114", optional = true }
serde_derive = { version = "^1.0.97", optional = true } serde_derive = { version = "1.0.114", optional = true }
[build-dependencies] [build-dependencies]
protoc-rust = { version = "^2.8.0", optional = true } protoc-rust = { version = "2.16.2", optional = true }
[dev-dependencies] [dev-dependencies]
serde_json = "1.0.40" serde_json = "1.0.56"
criterion = "0.3.3" criterion = "0.3.3"
rand = "0.7.0" rand = "0.7.3"
[features] [features]
serialization-protobuf = [ "protobuf", "protoc-rust" ] serialization-protobuf = [ "protobuf", "protoc-rust" ]
serialization-serde = [ "serde", "serde_derive" ] serialization-serde = [ "serde", "serde_derive" ]

2
PROTOC_VERSION
View File

@ -1 +1 @@
3.7.1 3.12.3

9
src/proto/mod.rs
View File

@ -3,12 +3,13 @@ mod proof;
use ring::digest::Algorithm; use ring::digest::Algorithm;
pub use self::proof::{LemmaProto, ProofProto};
use proof::{Lemma, Positioned, Proof};
use protobuf::error::ProtobufResult; use protobuf::error::ProtobufResult;
use protobuf::parse_from_bytes; use protobuf::parse_from_bytes;
use protobuf::Message;
use crate::proof::{Lemma, Positioned, Proof};
use crate::protobuf::Message;
pub use self::proof::{LemmaProto, ProofProto};
impl<T> Proof<T> { impl<T> Proof<T> {
/// Constructs a `Proof` struct from its Protobuf representation. /// Constructs a `Proof` struct from its Protobuf representation.