From 3a9435df9457467344349c8f96a5a3b9a3fa94c5 Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@patternsinthevoid.net>
Date: Mon, 13 Jul 2020 23:16:30 +0000
Subject: [PATCH] Fixup serde and ed25519 trait errors in tests/benches.

---
 Cargo.toml                    | 3 ++-
 benches/ed25519_benchmarks.rs | 1 +
 tests/ed25519.rs              | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 23196e9..eb6b73c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,7 @@ features = ["nightly", "batch"]
 [dependencies]
 curve25519-dalek = { version = "2", default-features = false }
 ed25519 = { version = "1", default-features = false }
-merlin = { version = "1", default-features = false, optional = true, git = "https://github.com/isislovecruft/merlin", branch = "develop" }
+merlin = { version = "2", default-features = false, optional = true }
 rand = { version = "0.7", default-features = false, optional = true }
 rand_core = { version = "0.5", default-features = false, optional = true }
 serde_crate = { package = "serde", version = "1.0", default-features = false, optional = true }
@@ -36,6 +36,7 @@ hex = "^0.4"
 bincode = "^0.9"
 criterion = "0.3"
 rand = "0.7"
+serde_crate = { package = "serde", version = "1.0", features = ["derive"] }
 
 [[bench]]
 name = "ed25519_benchmarks"
diff --git a/benches/ed25519_benchmarks.rs b/benches/ed25519_benchmarks.rs
index 0af2812..45dce35 100644
--- a/benches/ed25519_benchmarks.rs
+++ b/benches/ed25519_benchmarks.rs
@@ -20,6 +20,7 @@ mod ed25519_benches {
     use ed25519_dalek::Keypair;
     use ed25519_dalek::PublicKey;
     use ed25519_dalek::Signature;
+    use ed25519_dalek::Signer;
     use ed25519_dalek::verify_batch;
     use rand::thread_rng;
     use rand::prelude::ThreadRng;
diff --git a/tests/ed25519.rs b/tests/ed25519.rs
index 8904a69..2b4d419 100644
--- a/tests/ed25519.rs
+++ b/tests/ed25519.rs
@@ -16,7 +16,7 @@ extern crate hex;
 extern crate sha2;
 extern crate rand;
 #[cfg(all(test, feature = "serde"))]
-extern crate serde;
+extern crate serde_crate;
 #[cfg(all(test, feature = "serde"))]
 extern crate toml;
 
@@ -219,8 +219,10 @@ mod integrations {
     }
 }
 
+#[cfg(all(test, feature = "serde"))]
 use serde::{Deserialize, Serialize};
 
+#[cfg(all(test, feature = "serde"))]
 #[derive(Debug, Serialize, Deserialize)]
 struct Demo {
     keypair: Keypair