Merge pull request #134 from bltavares/update-ed25519-dalek

Update ed25519-dalek to the latest version

Author: bltavares

Cargo.toml

@@ -20,7 +20,7 @@ edition = "2018"
 [dependencies]
 blake2-rfc = "0.2.18"
 byteorder = "1.3.4"
-ed25519-dalek = "=1.0.0-pre.3"
+ed25519-dalek = "1.0.1"
 anyhow = "1.0.26"
 flat-tree = "5.0.0"
 lazy_static = "1.4.0"

src/crypto/key_pair.rs

@@ -1,6 +1,6 @@
 //! Generate an `Ed25519` keypair.
 
-pub use ed25519_dalek::{ExpandedSecretKey, Keypair, PublicKey, SecretKey, Signature};
+pub use ed25519_dalek::{ExpandedSecretKey, Keypair, PublicKey, SecretKey, Signature, Verifier};
 
 use anyhow::{bail, ensure, Result};
 use rand::rngs::{OsRng, StdRng};

src/prelude.rs

@@ -1,12 +1,8 @@
 //! Convenience wrapper to import all of Hypercore's core.
 //!
 //! ```rust
-//!
 //! use hypercore::prelude::*;
-//!
-//! fn main () {
-//!   let feed = Feed::default();
-//! }
+//! let feed = Feed::default();
 //! ```
 pub use crate::feed::Feed;
 // pub use feed_builder::FeedBuilder;

src/storage/mod.rs

@@ -16,6 +16,7 @@ use random_access_memory::RandomAccessMemory;
 use random_access_storage::RandomAccess;
 use sleep_parser::*;
 use std::borrow::Borrow;
+use std::convert::TryFrom;
 use std::fmt::Debug;
 use std::ops::Range;
 use std::path::PathBuf;
@@ -157,10 +158,10 @@ where
     }
 
     /// Search the signature stores for a `Signature`, starting at `index`.
-    pub fn next_signature<'a>(
-        &'a mut self,
+    pub fn next_signature(
+        &mut self,
         index: u64,
-    ) -> futures::future::BoxFuture<'a, Result<Signature>> {
+    ) -> futures::future::BoxFuture<'_, Result<Signature>> {
         let bytes = async_std::task::block_on(async {
             self.signatures
                 .read(HEADER_OFFSET + 64 * index, 64)
@@ -170,7 +171,7 @@ where
         async move {
             let bytes = bytes?;
             if not_zeroes(&bytes) {
-                Ok(Signature::from_bytes(&bytes)?)
+                Ok(Signature::try_from(&bytes[..])?)
             } else {
                 Ok(self.next_signature(index + 1).await?)
             }
@@ -187,7 +188,7 @@ where
             .await
             .map_err(|e| anyhow!(e))?;
         ensure!(not_zeroes(&bytes), "No signature found");
-        Ok(Signature::from_bytes(&bytes)?)
+        Ok(Signature::try_from(&bytes[..])?)
     }
 
     /// Write a `Signature` to `self.Signatures`.

tests/compat.rs

@@ -4,6 +4,7 @@ use ed25519_dalek;
 
 use tempfile;
 
+use std::convert::TryFrom;
 use std::fs::File;
 use std::io::Read;
 use std::path::{Path, PathBuf};
@@ -107,7 +108,7 @@ async fn deterministic_signatures() {
             expected_signatures
         );
 
-        let compat_signature = Signature::from_bytes(&compat_signature_struct).unwrap();
+        let compat_signature = Signature::try_from(&compat_signature_struct[..]).unwrap();
         feed.verify(feed.len() - 1, &compat_signature)
             .await
             .expect("Could not verify compat signature of hypercore v9");