From 7ef91b07d9654d0d22f379ba1a82daf1302529b6 Mon Sep 17 00:00:00 2001
From: Romain Ruetschi <github@romac.me>
Date: Thu, 9 Jul 2020 23:24:33 +0200
Subject: [PATCH] Update protobuf to v0.3.3

---
 CHANGELOG.md     |  1 +
 Cargo.toml       | 18 +++++++++---------
 PROTOC_VERSION   |  2 +-
 src/proto/mod.rs |  9 +++++----
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da950d0..6d93d09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
 
diff --git a/Cargo.toml b/Cargo.toml
index f705c64..0bded9b 100644
--- a/Cargo.toml
+++ b/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" ]
 
diff --git a/PROTOC_VERSION b/PROTOC_VERSION
index a76ccff..871f80a 100644
--- a/PROTOC_VERSION
+++ b/PROTOC_VERSION
@@ -1 +1 @@
-3.7.1
+3.12.3
diff --git a/src/proto/mod.rs b/src/proto/mod.rs
index b703999..fbda461 100644
--- a/src/proto/mod.rs
+++ b/src/proto/mod.rs
@@ -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.