From d4cffc7d0588329dd7140d7b9ad0e147204e7cc3 Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Mon, 21 Nov 2022 15:21:05 -0700
Subject: [PATCH] `ed25519` v2.0.0-pre.0 (#222)

Bumps the `ed25519` crate to the v2.0.0-pre.0 prerelease.

This version notably uses the `signature` crate's v2 API:

https://github.com/RustCrypto/traits/pull/1141
---
 Cargo.toml       | 2 +-
 src/signature.rs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 67f68b5..f2a3173 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ features = ["nightly", "batch"]
 
 [dependencies]
 curve25519-dalek = { version = "=4.0.0-pre.2", default-features = false }
-ed25519 = { version = "1", default-features = false }
+ed25519 = { version = "=2.0.0-pre.0", default-features = false }
 merlin = { version = "3", default-features = false, optional = true }
 rand = { version = "0.8", default-features = false, optional = true }
 rand_core = { version = "0.6", default-features = false, optional = true }
diff --git a/src/signature.rs b/src/signature.rs
index 880a78b..314e288 100644
--- a/src/signature.rs
+++ b/src/signature.rs
@@ -14,7 +14,6 @@ use core::fmt::Debug;
 
 use curve25519_dalek::edwards::CompressedEdwardsY;
 use curve25519_dalek::scalar::Scalar;
-use ed25519::signature::Signature as _;
 
 use crate::constants::*;
 use crate::errors::*;
@@ -194,7 +193,7 @@ impl TryFrom<&ed25519::Signature> for InternalSignature {
     type Error = SignatureError;
 
     fn try_from(sig: &ed25519::Signature) -> Result<InternalSignature, SignatureError> {
-        InternalSignature::from_bytes(sig.as_bytes())
+        InternalSignature::from_bytes(sig.as_ref())
     }
 }