From 918c48f20724a60bb698988c3890e0a081f7968d Mon Sep 17 00:00:00 2001
From: Wiktor Kwapisiewicz <wiktor@metacode.biz>
Date: Tue, 28 Apr 2020 16:03:30 +0200
Subject: openpgp: Simplify Cert::try_from conversions from packets.

  - Convert Cert::try_from(PacketPile::from(packets)) into
    Cert::try_from(packets).

  - Fixes #496.
---
 sqv/tests/revoked-key.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'sqv')

diff --git a/sqv/tests/revoked-key.rs b/sqv/tests/revoked-key.rs
index 79d6913e..518bf8b8 100644
--- a/sqv/tests/revoked-key.rs
+++ b/sqv/tests/revoked-key.rs
@@ -254,7 +254,6 @@ fn create_key() {
     use sequoia_openpgp::{
         Cert,
         Packet,
-        PacketPile,
         packet::{
             signature,
             Key,
@@ -353,14 +352,14 @@ fn create_key() {
         .unwrap();
     let sk_bind2 = b.sign_subkey_binding(&mut signer, &key, &subkey).unwrap();
 
-    let cert = Cert::try_from(PacketPile::from(vec![
+    let cert = Cert::try_from(vec![
         key.clone().into(),
         direct1.clone().into(),
         direct2.clone().into(),
         subkey.clone().into(),
         sk_bind1.clone().into(),
         sk_bind2.clone().into(),
-    ])).unwrap();
+    ]).unwrap();
     let mut fd = File::create("revoked-key-cert-not-revoked.pgp").unwrap();
     cert.serialize(&mut fd).unwrap();
 
@@ -386,7 +385,7 @@ fn create_key() {
         }
 
         let rev = b.sign_direct_key(&mut signer).unwrap();
-        let cert = Cert::try_from(PacketPile::from(vec![
+        let cert = Cert::try_from(vec![
             key.clone().into(),
             direct1.clone().into(),
             rev.clone().into(),
@@ -394,7 +393,7 @@ fn create_key() {
             subkey.clone().into(),
             sk_bind1.clone().into(),
             sk_bind2.clone().into(),
-        ])).unwrap();
+        ]).unwrap();
 
         let mut fd =
             File::create(format!("revoked-key-cert-revoked-{}.pgp", slug))
@@ -413,7 +412,7 @@ fn create_key() {
         }
 
         let rev = b.sign_subkey_binding(&mut signer, &key, &subkey).unwrap();
-        let cert = Cert::try_from(PacketPile::from(vec![
+        let cert = Cert::try_from(vec![
             key.clone().into(),
             direct1.clone().into(),
             direct2.clone().into(),
@@ -421,7 +420,7 @@ fn create_key() {
             sk_bind1.clone().into(),
             rev.clone().into(),
             sk_bind2.clone().into(),
-        ])).unwrap();
+        ]).unwrap();
 
         let mut fd =
             File::create(format!("revoked-key-cert-revoked-{}.sk.pgp", slug))
-- 
cgit v1.2.3