mirror of
https://github.com/mii443/merkle.rs.git
synced 2025-08-22 07:55:29 +00:00
Update protobuf to v0.3.3
This commit is contained in:
@ -6,6 +6,7 @@
|
||||
## Changed
|
||||
- Update to Rust 2018 ([@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
|
||||
|
||||
|
18
Cargo.toml
18
Cargo.toml
@ -32,20 +32,20 @@ name = "proof"
|
||||
harness = false
|
||||
|
||||
[dependencies]
|
||||
ring = "^0.16.1"
|
||||
protobuf = { version = "^2.8.0", optional = true }
|
||||
serde = { version = "^1.0.97", optional = true }
|
||||
serde_derive = { version = "^1.0.97", optional = true }
|
||||
ring = "0.16.15"
|
||||
protobuf = { version = "2.16.2", optional = true }
|
||||
serde = { version = "1.0.114", optional = true }
|
||||
serde_derive = { version = "1.0.114", optional = true }
|
||||
|
||||
[build-dependencies]
|
||||
protoc-rust = { version = "^2.8.0", optional = true }
|
||||
protoc-rust = { version = "2.16.2", optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
serde_json = "1.0.40"
|
||||
criterion = "0.3.3"
|
||||
rand = "0.7.0"
|
||||
serde_json = "1.0.56"
|
||||
criterion = "0.3.3"
|
||||
rand = "0.7.3"
|
||||
|
||||
[features]
|
||||
serialization-protobuf = [ "protobuf", "protoc-rust" ]
|
||||
serialization-serde = [ "serde", "serde_derive" ]
|
||||
serialization-serde = [ "serde", "serde_derive" ]
|
||||
|
||||
|
@ -1 +1 @@
|
||||
3.7.1
|
||||
3.12.3
|
||||
|
@ -3,12 +3,13 @@ mod proof;
|
||||
|
||||
use ring::digest::Algorithm;
|
||||
|
||||
pub use self::proof::{LemmaProto, ProofProto};
|
||||
use proof::{Lemma, Positioned, Proof};
|
||||
|
||||
use protobuf::error::ProtobufResult;
|
||||
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> {
|
||||
/// Constructs a `Proof` struct from its Protobuf representation.
|
||||
|
Reference in New Issue
Block a user