Merge branch 'master' into grpc-rs

beacon_chain/utils/bls/src/public_key.rs

@@ -2,6 +2,7 @@ use super::SecretKey;
 use bls_aggregates::PublicKey as RawPublicKey;
 use hex::encode as hex_encode;
 use ssz::{decode_ssz_list, ssz_encode, Decodable, DecodeError, Encodable, SszStream};
+use std::default;
 use std::hash::{Hash, Hasher};
 
 /// A single BLS signature.
@@ -31,6 +32,13 @@ impl PublicKey {
     }
 }
 
+impl default::Default for PublicKey {
+    fn default() -> Self {
+        let secret_key = SecretKey::random();
+        PublicKey::from_secret_key(&secret_key)
+    }
+}
+
 impl Encodable for PublicKey {
     fn ssz_append(&self, s: &mut SszStream) {
         s.append_vec(&self.0.as_bytes());

beacon_chain/utils/bls/src/signature.rs

@@ -35,6 +35,12 @@ impl Signature {
     pub fn as_raw(&self) -> &RawSignature {
         &self.0
     }
+
+    /// Returns a new empty signature.
+    pub fn empty_signature() -> Self {
+        let empty: Vec<u8> = vec![0; 97];
+        Signature(RawSignature::from_bytes(&empty).unwrap())
+    }
 }
 
 impl Encodable for Signature {
@@ -68,4 +74,16 @@ mod tests {
 
         assert_eq!(original, decoded);
     }
+
+    #[test]
+    pub fn test_empty_signature() {
+        let sig = Signature::empty_signature();
+
+        let sig_as_bytes: Vec<u8> = sig.as_raw().as_bytes();
+
+        assert_eq!(sig_as_bytes.len(), 97);
+        for one_byte in sig_as_bytes.iter() {
+            assert_eq!(*one_byte, 0);
+        }
+    }
 }