openpgp: Use public interface in tests.

2 files changed, 18 insertions, 13 deletions

diff --git a/openpgp/src/cert.rs b/openpgp/src/cert.rs
index a1b62462..bb891b31 100644
--- a/openpgp/src/cert.rs
+++ b/openpgp/src/cert.rs
@@ -4404,8 +4404,9 @@ mod test {
             assert_eq!(cert.userids.len(), 1);
             assert_eq!(cert.userids[0].userid().value(),
                        &b"Testy McTestface <testy@example.org>"[..]);
-            assert_eq!(cert.userids[0].self_signatures.len(), 1);
-            assert_eq!(cert.userids[0].self_signatures[0].digest_prefix(),
+            assert_eq!(cert.userids[0].self_signatures2().count(), 1);
+            assert_eq!(cert.userids[0].self_signatures2().next().unwrap()
+                       .digest_prefix(),
                        &[ 0xc6, 0x8f ]);
             assert_eq!(cert.user_attributes.len(), 0);
             assert_eq!(cert.subkeys.len(), 1);
@@ -4426,8 +4427,9 @@ mod test {
             assert_eq!(cert.userids.len(), 1, "number of userids");
             assert_eq!(cert.userids[0].userid().value(),
                        &b"Testy McTestface <testy@example.org>"[..]);
-            assert_eq!(cert.userids[0].self_signatures.len(), 1);
-            assert_eq!(cert.userids[0].self_signatures[0].digest_prefix(),
+            assert_eq!(cert.userids[0].self_signatures2().count(), 1);
+            assert_eq!(cert.userids[0].self_signatures2().next().unwrap()
+                       .digest_prefix(),
                        &[ 0xc6, 0x8f ]);
 
             assert_eq!(cert.user_attributes.len(), 0);
@@ -4435,7 +4437,8 @@ mod test {
             assert_eq!(cert.subkeys.len(), 1, "number of subkeys");
             assert_eq!(cert.subkeys[0].key().creation_time(),
                        Timestamp::from(1511355130).into());
-            assert_eq!(cert.subkeys[0].self_signatures[0].digest_prefix(),
+            assert_eq!(cert.subkeys[0].self_signatures2().next().unwrap()
+                       .digest_prefix(),
                        &[ 0xb7, 0xb9 ]);
 
             let cert = parse_cert(crate::tests::key("testy-no-subkey.pgp"),
@@ -4450,8 +4453,9 @@ mod test {
             assert_eq!(cert.userids.len(), 1, "number of userids");
             assert_eq!(cert.userids[0].userid().value(),
                        &b"Testy McTestface <testy@example.org>"[..]);
-            assert_eq!(cert.userids[0].self_signatures.len(), 1);
-            assert_eq!(cert.userids[0].self_signatures[0].digest_prefix(),
+            assert_eq!(cert.userids[0].self_signatures2().count(), 1);
+            assert_eq!(cert.userids[0].self_signatures2().next().unwrap()
+                       .digest_prefix(),
                        &[ 0xc6, 0x8f ]);
 
             assert_eq!(cert.subkeys.len(), 0, "number of subkeys");
@@ -4590,20 +4594,20 @@ mod test {
             .unwrap();
 
         assert!(cert_donald_signs_base.userids.len() == 1);
-        assert!(cert_donald_signs_base.userids[0].self_signatures.len() == 1);
+        assert!(cert_donald_signs_base.userids[0].self_signatures2().count() == 1);
         assert!(cert_base.userids[0].certifications.is_empty());
         assert!(cert_donald_signs_base.userids[0].certifications.len() == 1);
 
         let merged = cert_donald_signs_base.clone()
             .merge_public_and_secret(cert_ivanka_signs_base.clone()).unwrap();
         assert!(merged.userids.len() == 1);
-        assert!(merged.userids[0].self_signatures.len() == 1);
+        assert!(merged.userids[0].self_signatures2().count() == 1);
         assert!(merged.userids[0].certifications.len() == 2);
 
         let merged = cert_donald_signs_base.clone()
             .merge_public_and_secret(cert_donald_signs_all.clone()).unwrap();
         assert!(merged.userids.len() == 3);
-        assert!(merged.userids[0].self_signatures.len() == 1);
+        assert!(merged.userids[0].self_signatures2().count() == 1);
         // There should be two certifications from the Donald on the
         // first user id.
         assert!(merged.userids[0].certifications.len() == 2);
@@ -4615,7 +4619,7 @@ mod test {
             .merge_public_and_secret(cert_ivanka_signs_base.clone()).unwrap()
             .merge_public_and_secret(cert_ivanka_signs_all.clone()).unwrap();
         assert!(merged.userids.len() == 3);
-        assert!(merged.userids[0].self_signatures.len() == 1);
+        assert!(merged.userids[0].self_signatures2().count() == 1);
         // There should be two certifications from each of the Donald
         // and Ivanka on the first user id, and one each on the rest.
         assert!(merged.userids[0].certifications.len() == 4);
@@ -4633,7 +4637,7 @@ mod test {
             .merge_public_and_secret(cert_donald_signs_all.clone()).unwrap()
             .merge_public_and_secret(cert_ivanka_signs_all.clone()).unwrap();
         assert!(merged.userids.len() == 3);
-        assert!(merged.userids[0].self_signatures.len() == 1);
+        assert!(merged.userids[0].self_signatures2().count() == 1);
         // There should be two certifications from each of the Donald
         // and Ivanka on the first user id, and one each on the rest.
         assert!(merged.userids[0].certifications.len() == 4);
diff --git a/openpgp/src/cert/builder.rs b/openpgp/src/cert/builder.rs
index 8dbe9c80..7c3c1933 100644
--- a/openpgp/src/cert/builder.rs
+++ b/openpgp/src/cert/builder.rs
@@ -1715,7 +1715,8 @@ mod tests {
             .set_primary_key_flags(KeyFlags::empty())
             .add_subkey(KeyFlags::empty().set_certification(), None, None)
             .generate().unwrap();
-        let sig_pkts = cert1.subkeys().next().unwrap().bundle().self_signatures[0].hashed_area();
+        let sig_pkts = cert1.subkeys().next().unwrap().bundle()
+            .self_signatures2().next().unwrap().hashed_area();
 
         match sig_pkts.subpacket(SubpacketTag::KeyFlags).unwrap().value() {
             SubpacketValue::KeyFlags(ref ks) => assert!(ks.for_certification()),