*: Consolidate protobuf scripts and update to rust-protobuf 2.8.1

core/Cargo.toml

@@ -23,7 +23,7 @@ multihash = { package = "parity-multihash", version = "0.1.0", path = "../misc/m
 multistream-select = { version = "0.5.0", path = "../misc/multistream-select" }
 futures = "0.1"
 parking_lot = "0.8"
-protobuf = "2.3"
+protobuf = "2.8"
 quick-error = "1.2"
 rand = "0.6"
 rw-stream-sink = { version = "0.1.1", path = "../misc/rw-stream-sink" }

core/keys.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 enum KeyType {
   RSA = 0;
   Ed25519 = 1;

core/regen_structs_proto.sh

@@ -1,13 +1,3 @@
 #!/bin/sh
 
-# This script regenerates the `src/structs_proto.rs` and `src/keys_proto.rs` files from
-# `structs.proto` and `keys.proto`.
-
-sudo docker run --rm -v `pwd`:/usr/code:z -w /usr/code rust /bin/bash -c " \
-    apt-get update; \
-    apt-get install -y protobuf-compiler; \
-    cargo install --version 2.3.0 protobuf-codegen; \
-    protoc --rust_out . keys.proto"
-
-sudo chown $USER:$USER keys.rs
-mv -f keys.rs ./src/keys_proto.rs
+../scripts/protobuf/gen.sh keys.proto ./src/

core/src/identity.rs

@@ -29,7 +29,7 @@ pub mod secp256k1;
 pub mod error;
 
 use self::error::*;
-use crate::{PeerId, keys_proto};
+use crate::{PeerId, keys};
 
 /// Identity keypair of a node.
 ///
@@ -150,20 +150,20 @@ impl PublicKey {
     /// exchange with other nodes.
     pub fn into_protobuf_encoding(self) -> Vec<u8> {
         use protobuf::Message;
-        let mut public_key = keys_proto::PublicKey::new();
+        let mut public_key = keys::PublicKey::new();
         match self {
             PublicKey::Ed25519(key) => {
-                public_key.set_Type(keys_proto::KeyType::Ed25519);
+                public_key.set_Type(keys::KeyType::Ed25519);
                 public_key.set_Data(key.encode().to_vec());
             },
             #[cfg(not(any(target_os = "emscripten", target_os = "unknown")))]
             PublicKey::Rsa(key) => {
-                public_key.set_Type(keys_proto::KeyType::RSA);
+                public_key.set_Type(keys::KeyType::RSA);
                 public_key.set_Data(key.encode_x509());
             },
             #[cfg(feature = "secp256k1")]
             PublicKey::Secp256k1(key) => {
-                public_key.set_Type(keys_proto::KeyType::Secp256k1);
+                public_key.set_Type(keys::KeyType::Secp256k1);
                 public_key.set_Data(key.encode().to_vec());
             },
         };
@@ -177,31 +177,31 @@ impl PublicKey {
     /// or received from another node.
     pub fn from_protobuf_encoding(bytes: &[u8]) -> Result<PublicKey, DecodingError> {
         #[allow(unused_mut)] // Due to conditional compilation.
-        let mut pubkey = protobuf::parse_from_bytes::<keys_proto::PublicKey>(bytes)
+        let mut pubkey = protobuf::parse_from_bytes::<keys::PublicKey>(bytes)
             .map_err(|e| DecodingError::new("Protobuf").source(e))?;
 
         match pubkey.get_Type() {
-            keys_proto::KeyType::Ed25519 => {
+            keys::KeyType::Ed25519 => {
                 ed25519::PublicKey::decode(pubkey.get_Data())
                     .map(PublicKey::Ed25519)
             },
             #[cfg(not(any(target_os = "emscripten", target_os = "unknown")))]
-            keys_proto::KeyType::RSA => {
+            keys::KeyType::RSA => {
                 rsa::PublicKey::decode_x509(&pubkey.take_Data())
                     .map(PublicKey::Rsa)
             }
             #[cfg(any(target_os = "emscripten", target_os = "unknown"))]
-            keys_proto::KeyType::RSA => {
+            keys::KeyType::RSA => {
                 log::debug!("support for RSA was disabled at compile-time");
                 Err(DecodingError::new("Unsupported"))
             },
             #[cfg(feature = "secp256k1")]
-            keys_proto::KeyType::Secp256k1 => {
+            keys::KeyType::Secp256k1 => {
                 secp256k1::PublicKey::decode(pubkey.get_Data())
                     .map(PublicKey::Secp256k1)
             }
             #[cfg(not(feature = "secp256k1"))]
-            keys_proto::KeyType::Secp256k1 => {
+            keys::KeyType::Secp256k1 => {
                 log::debug!("support for secp256k1 was disabled at compile-time");
                 Err("Unsupported".to_string().into())
             },

core/src/keys_proto.rs → core/src/keys.rs

@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.3.0. Do not edit
+// This file is generated by rust-protobuf 2.8.1. Do not edit
 // @generated
 
 // https://github.com/Manishearth/rust-clippy/issues/702
@@ -17,10 +17,15 @@
 #![allow(unsafe_code)]
 #![allow(unused_imports)]
 #![allow(unused_results)]
+//! Generated file from `keys.proto`
 
 use protobuf::Message as Message_imported_for_functions;
 use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
 
+/// Generated files are compatible only with the same version
+/// of protobuf runtime.
+const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1;
+
 #[derive(PartialEq,Clone,Default)]
 pub struct PublicKey {
     // message fields
@@ -31,13 +36,23 @@ pub struct PublicKey {
     pub cached_size: ::protobuf::CachedSize,
 }
 
+impl<'a> ::std::default::Default for &'a PublicKey {
+    fn default() -> &'a PublicKey {
+        <PublicKey as ::protobuf::Message>::default_instance()
+    }
+}
+
 impl PublicKey {
     pub fn new() -> PublicKey {
         ::std::default::Default::default()
     }
 
     // required .KeyType Type = 1;
 
+
+    pub fn get_Type(&self) -> KeyType {
+        self.Type.unwrap_or(KeyType::RSA)
+    }
     pub fn clear_Type(&mut self) {
         self.Type = ::std::option::Option::None;
     }
@@ -51,12 +66,15 @@ impl PublicKey {
         self.Type = ::std::option::Option::Some(v);
     }
 
-    pub fn get_Type(&self) -> KeyType {
-        self.Type.unwrap_or(KeyType::RSA)
-    }
-
     // required bytes Data = 2;
 
+
+    pub fn get_Data(&self) -> &[u8] {
+        match self.Data.as_ref() {
+            Some(v) => &v,
+            None => &[],
+        }
+    }
     pub fn clear_Data(&mut self) {
         self.Data.clear();
     }
@@ -83,13 +101,6 @@ impl PublicKey {
     pub fn take_Data(&mut self) -> ::std::vec::Vec<u8> {
         self.Data.take().unwrap_or_else(|| ::std::vec::Vec::new())
     }
-
-    pub fn get_Data(&self) -> &[u8] {
-        match self.Data.as_ref() {
-            Some(v) => &v,
-            None => &[],
-        }
-    }
 }
 
 impl ::protobuf::Message for PublicKey {
@@ -217,8 +228,8 @@ impl ::protobuf::Message for PublicKey {
 
 impl ::protobuf::Clear for PublicKey {
     fn clear(&mut self) {
-        self.clear_Type();
-        self.clear_Data();
+        self.Type = ::std::option::Option::None;
+        self.Data.clear();
         self.unknown_fields.clear();
     }
 }
@@ -230,7 +241,7 @@ impl ::std::fmt::Debug for PublicKey {
 }
 
 impl ::protobuf::reflect::ProtobufValue for PublicKey {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef<'_> {
+    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
         ::protobuf::reflect::ProtobufValueRef::Message(self)
     }
 }
@@ -245,13 +256,23 @@ pub struct PrivateKey {
     pub cached_size: ::protobuf::CachedSize,
 }
 
+impl<'a> ::std::default::Default for &'a PrivateKey {
+    fn default() -> &'a PrivateKey {
+        <PrivateKey as ::protobuf::Message>::default_instance()
+    }
+}
+
 impl PrivateKey {
     pub fn new() -> PrivateKey {
         ::std::default::Default::default()
     }
 
     // required .KeyType Type = 1;
 
+
+    pub fn get_Type(&self) -> KeyType {
+        self.Type.unwrap_or(KeyType::RSA)
+    }
     pub fn clear_Type(&mut self) {
         self.Type = ::std::option::Option::None;
     }
@@ -265,12 +286,15 @@ impl PrivateKey {
         self.Type = ::std::option::Option::Some(v);
     }
 
-    pub fn get_Type(&self) -> KeyType {
-        self.Type.unwrap_or(KeyType::RSA)
-    }
-
     // required bytes Data = 2;
 
+
+    pub fn get_Data(&self) -> &[u8] {
+        match self.Data.as_ref() {
+            Some(v) => &v,
+            None => &[],
+        }
+    }
     pub fn clear_Data(&mut self) {
         self.Data.clear();
     }
@@ -297,13 +321,6 @@ impl PrivateKey {
     pub fn take_Data(&mut self) -> ::std::vec::Vec<u8> {
         self.Data.take().unwrap_or_else(|| ::std::vec::Vec::new())
     }
-
-    pub fn get_Data(&self) -> &[u8] {
-        match self.Data.as_ref() {
-            Some(v) => &v,
-            None => &[],
-        }
-    }
 }
 
 impl ::protobuf::Message for PrivateKey {
@@ -431,8 +448,8 @@ impl ::protobuf::Message for PrivateKey {
 
 impl ::protobuf::Clear for PrivateKey {
     fn clear(&mut self) {
-        self.clear_Type();
-        self.clear_Data();
+        self.Type = ::std::option::Option::None;
+        self.Data.clear();
         self.unknown_fields.clear();
     }
 }
@@ -444,7 +461,7 @@ impl ::std::fmt::Debug for PrivateKey {
 }
 
 impl ::protobuf::reflect::ProtobufValue for PrivateKey {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef<'_> {
+    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
         ::protobuf::reflect::ProtobufValueRef::Message(self)
     }
 }
@@ -502,41 +519,41 @@ impl ::std::default::Default for KeyType {
 }
 
 impl ::protobuf::reflect::ProtobufValue for KeyType {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef<'_> {
+    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
         ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
     }
 }
 
 static file_descriptor_proto_data: &'static [u8] = b"\
     \n\nkeys.proto\"=\n\tPublicKey\x12\x1c\n\x04Type\x18\x01\x20\x02(\x0e2\
-    \x08.KeyTypeR\x04type\x12\x12\n\x04Data\x18\x02\x20\x02(\x0cR\x04data\">\
-    \n\nPrivateKey\x12\x1c\n\x04Type\x18\x01\x20\x02(\x0e2\x08.KeyTypeR\x04t\
-    ype\x12\x12\n\x04Data\x18\x02\x20\x02(\x0cR\x04data*.\n\x07KeyType\x12\
+    \x08.KeyTypeR\x04Type\x12\x12\n\x04Data\x18\x02\x20\x02(\x0cR\x04Data\">\
+    \n\nPrivateKey\x12\x1c\n\x04Type\x18\x01\x20\x02(\x0e2\x08.KeyTypeR\x04T\
+    ype\x12\x12\n\x04Data\x18\x02\x20\x02(\x0cR\x04Data*.\n\x07KeyType\x12\
     \x07\n\x03RSA\x10\0\x12\x0b\n\x07Ed25519\x10\x01\x12\r\n\tSecp256k1\x10\
-    \x02J\xdf\x03\n\x06\x12\x04\0\0\x0e\x01\n\n\n\x02\x05\0\x12\x04\0\0\x04\
-    \x01\n\n\n\x03\x05\0\x01\x12\x03\0\x05\x0c\n\x0b\n\x04\x05\0\x02\0\x12\
-    \x03\x01\x02\n\n\x0c\n\x05\x05\0\x02\0\x01\x12\x03\x01\x02\x05\n\x0c\n\
-    \x05\x05\0\x02\0\x02\x12\x03\x01\x08\t\n\x0b\n\x04\x05\0\x02\x01\x12\x03\
-    \x02\x02\x0e\n\x0c\n\x05\x05\0\x02\x01\x01\x12\x03\x02\x02\t\n\x0c\n\x05\
-    \x05\0\x02\x01\x02\x12\x03\x02\x0c\r\n\x0b\n\x04\x05\0\x02\x02\x12\x03\
-    \x03\x02\x10\n\x0c\n\x05\x05\0\x02\x02\x01\x12\x03\x03\x02\x0b\n\x0c\n\
-    \x05\x05\0\x02\x02\x02\x12\x03\x03\x0e\x0f\n\n\n\x02\x04\0\x12\x04\x06\0\
-    \t\x01\n\n\n\x03\x04\0\x01\x12\x03\x06\x08\x11\n\x0b\n\x04\x04\0\x02\0\
-    \x12\x03\x07\x02\x1c\n\x0c\n\x05\x04\0\x02\0\x04\x12\x03\x07\x02\n\n\x0c\
-    \n\x05\x04\0\x02\0\x06\x12\x03\x07\x0b\x12\n\x0c\n\x05\x04\0\x02\0\x01\
-    \x12\x03\x07\x13\x17\n\x0c\n\x05\x04\0\x02\0\x03\x12\x03\x07\x1a\x1b\n\
-    \x0b\n\x04\x04\0\x02\x01\x12\x03\x08\x02\x1a\n\x0c\n\x05\x04\0\x02\x01\
-    \x04\x12\x03\x08\x02\n\n\x0c\n\x05\x04\0\x02\x01\x05\x12\x03\x08\x0b\x10\
-    \n\x0c\n\x05\x04\0\x02\x01\x01\x12\x03\x08\x11\x15\n\x0c\n\x05\x04\0\x02\
-    \x01\x03\x12\x03\x08\x18\x19\n\n\n\x02\x04\x01\x12\x04\x0b\0\x0e\x01\n\n\
-    \n\x03\x04\x01\x01\x12\x03\x0b\x08\x12\n\x0b\n\x04\x04\x01\x02\0\x12\x03\
-    \x0c\x02\x1c\n\x0c\n\x05\x04\x01\x02\0\x04\x12\x03\x0c\x02\n\n\x0c\n\x05\
-    \x04\x01\x02\0\x06\x12\x03\x0c\x0b\x12\n\x0c\n\x05\x04\x01\x02\0\x01\x12\
-    \x03\x0c\x13\x17\n\x0c\n\x05\x04\x01\x02\0\x03\x12\x03\x0c\x1a\x1b\n\x0b\
-    \n\x04\x04\x01\x02\x01\x12\x03\r\x02\x1a\n\x0c\n\x05\x04\x01\x02\x01\x04\
-    \x12\x03\r\x02\n\n\x0c\n\x05\x04\x01\x02\x01\x05\x12\x03\r\x0b\x10\n\x0c\
-    \n\x05\x04\x01\x02\x01\x01\x12\x03\r\x11\x15\n\x0c\n\x05\x04\x01\x02\x01\
-    \x03\x12\x03\r\x18\x19\
+    \x02J\xe9\x03\n\x06\x12\x04\0\0\x10\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\
+    \n\n\n\x02\x05\0\x12\x04\x02\0\x06\x01\n\n\n\x03\x05\0\x01\x12\x03\x02\
+    \x05\x0c\n\x0b\n\x04\x05\0\x02\0\x12\x03\x03\x02\n\n\x0c\n\x05\x05\0\x02\
+    \0\x01\x12\x03\x03\x02\x05\n\x0c\n\x05\x05\0\x02\0\x02\x12\x03\x03\x08\t\
+    \n\x0b\n\x04\x05\0\x02\x01\x12\x03\x04\x02\x0e\n\x0c\n\x05\x05\0\x02\x01\
+    \x01\x12\x03\x04\x02\t\n\x0c\n\x05\x05\0\x02\x01\x02\x12\x03\x04\x0c\r\n\
+    \x0b\n\x04\x05\0\x02\x02\x12\x03\x05\x02\x10\n\x0c\n\x05\x05\0\x02\x02\
+    \x01\x12\x03\x05\x02\x0b\n\x0c\n\x05\x05\0\x02\x02\x02\x12\x03\x05\x0e\
+    \x0f\n\n\n\x02\x04\0\x12\x04\x08\0\x0b\x01\n\n\n\x03\x04\0\x01\x12\x03\
+    \x08\x08\x11\n\x0b\n\x04\x04\0\x02\0\x12\x03\t\x02\x1c\n\x0c\n\x05\x04\0\
+    \x02\0\x04\x12\x03\t\x02\n\n\x0c\n\x05\x04\0\x02\0\x06\x12\x03\t\x0b\x12\
+    \n\x0c\n\x05\x04\0\x02\0\x01\x12\x03\t\x13\x17\n\x0c\n\x05\x04\0\x02\0\
+    \x03\x12\x03\t\x1a\x1b\n\x0b\n\x04\x04\0\x02\x01\x12\x03\n\x02\x1a\n\x0c\
+    \n\x05\x04\0\x02\x01\x04\x12\x03\n\x02\n\n\x0c\n\x05\x04\0\x02\x01\x05\
+    \x12\x03\n\x0b\x10\n\x0c\n\x05\x04\0\x02\x01\x01\x12\x03\n\x11\x15\n\x0c\
+    \n\x05\x04\0\x02\x01\x03\x12\x03\n\x18\x19\n\n\n\x02\x04\x01\x12\x04\r\0\
+    \x10\x01\n\n\n\x03\x04\x01\x01\x12\x03\r\x08\x12\n\x0b\n\x04\x04\x01\x02\
+    \0\x12\x03\x0e\x02\x1c\n\x0c\n\x05\x04\x01\x02\0\x04\x12\x03\x0e\x02\n\n\
+    \x0c\n\x05\x04\x01\x02\0\x06\x12\x03\x0e\x0b\x12\n\x0c\n\x05\x04\x01\x02\
+    \0\x01\x12\x03\x0e\x13\x17\n\x0c\n\x05\x04\x01\x02\0\x03\x12\x03\x0e\x1a\
+    \x1b\n\x0b\n\x04\x04\x01\x02\x01\x12\x03\x0f\x02\x1a\n\x0c\n\x05\x04\x01\
+    \x02\x01\x04\x12\x03\x0f\x02\n\n\x0c\n\x05\x04\x01\x02\x01\x05\x12\x03\
+    \x0f\x0b\x10\n\x0c\n\x05\x04\x01\x02\x01\x01\x12\x03\x0f\x11\x15\n\x0c\n\
+    \x05\x04\x01\x02\x01\x03\x12\x03\x0f\x18\x19\
 ";
 
 static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {

core/src/lib.rs

@@ -39,7 +39,7 @@
 pub use multiaddr;
 pub use multistream_select::Negotiated;
 
-mod keys_proto;
+mod keys;
 mod peer_id;
 mod translation;
 

protocols/floodsub/Cargo.toml

@@ -17,7 +17,7 @@ fnv = "1.0"
 futures = "0.1"
 libp2p-core = { version = "0.12.0", path = "../../core" }
 libp2p-swarm = { version = "0.2.0", path = "../../swarm" }
-protobuf = "2.3"
+protobuf = "2.8"
 rand = "0.6"
 smallvec = "0.6.5"
 tokio-io = "0.1"

protocols/floodsub/regen_structs_proto.sh

@@ -1,13 +1,3 @@
 #!/bin/sh
 
-# This script regenerates the `src/rpc_proto.rs` file from `rpc.proto`.
-
-docker run --rm -v `pwd`:/usr/code:z -w /usr/code rust /bin/bash -c " \
-    apt-get update; \
-    apt-get install -y protobuf-compiler; \
-    cargo install --version 2.3.0 protobuf-codegen; \
-    protoc --rust_out . rpc.proto"
-
-sudo chown $USER:$USER *.rs
-
-mv -f rpc.rs ./src/rpc_proto.rs
+../../scripts/protobuf/gen.sh rpc.proto ./src/

protocols/floodsub/rpc.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package floodsub.pb;
 
 message RPC {

protocols/floodsub/src/lib.rs

@@ -24,7 +24,7 @@
 pub mod protocol;
 
 mod layer;
-mod rpc_proto;
+mod rpc;
 mod topic;
 
 pub use self::layer::{Floodsub, FloodsubEvent};