From aaaca386bc6e41508ef955c6b27df776be73c24e Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Fri, 31 May 2019 18:22:07 +0200
Subject: openpgp: Simplify tests.

---
 openpgp/src/message/mod.rs | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'openpgp/src/message')

diff --git a/openpgp/src/message/mod.rs b/openpgp/src/message/mod.rs
index c0d701b0..e422a7aa 100644
--- a/openpgp/src/message/mod.rs
+++ b/openpgp/src/message/mod.rs
@@ -440,7 +440,6 @@ mod tests {
     use SymmetricAlgorithm;
     use PublicKeyAlgorithm;
     use SignatureType;
-    use crypto::KeyPair;
     use crypto::s2k::S2K;
     use crypto::mpis::{Ciphertext, MPI};
     use packet::prelude::*;
@@ -802,15 +801,9 @@ mod tests {
         let key: Key =
             ::packet::key::Key4::generate_ecc(true, ::constants::Curve::Ed25519)
             .unwrap().into();
-        let sec =
-            if let Some(SecretKey::Unencrypted { ref mpis }) = key.secret() {
-                mpis.clone()
-            } else {
-                panic!()
-            };
+        let mut pair = key.clone().into_keypair().unwrap();
         let sig = ::packet::signature::Builder::new(SignatureType::Binary)
-            .sign_hash(&mut KeyPair::new(key, sec).unwrap(),
-                       hash, hash.context().unwrap()).unwrap();
+            .sign_hash(&mut pair, hash, hash.context().unwrap()).unwrap();
 
         // 0: OnePassSig
         // => bad.
@@ -920,15 +913,9 @@ mod tests {
         let key: Key =
             ::packet::key::Key4::generate_ecc(true, ::constants::Curve::Ed25519)
             .unwrap().into();
-        let sec =
-            if let Some(SecretKey::Unencrypted { ref mpis }) = key.secret() {
-                mpis.clone()
-            } else {
-                panic!()
-            };
+        let mut pair = key.clone().into_keypair().unwrap();
         let sig = ::packet::signature::Builder::new(SignatureType::Binary)
-            .sign_hash(&mut KeyPair::new(key, sec).unwrap(),
-                       hash, hash.context().unwrap()).unwrap();
+            .sign_hash(&mut pair, hash, hash.context().unwrap()).unwrap();
 
         // 0: Signature
         // => bad.
-- 
cgit v1.2.3