test: split public keys from secret keys in runtime

Author: link2xt

src/test_utils.rs

@@ -33,7 +33,7 @@ use crate::contact::{import_vcard, make_vcard, Contact, ContactId, Modifier, Ori
 use crate::context::Context;
 use crate::e2ee::EncryptHelper;
 use crate::events::{Event, EventEmitter, EventType, Events};
-use crate::key::{self, DcKey};
+use crate::key::{self, DcKey, DcSecretKey};
 use crate::message::{update_msg_state, Message, MessageState, MsgId, Viewtype};
 use crate::mimeparser::{MimeMessage, SystemMessage};
 use crate::peerstate::Peerstate;
@@ -1141,79 +1141,66 @@ impl SentMessage<'_> {
 ///
 /// The keypair was created using the crate::key::tests::gen_key test.
 pub fn alice_keypair() -> KeyPair {
-    let public = key::SignedPublicKey::from_asc(include_str!("../test-data/key/alice-public.asc"))
-        .unwrap()
-        .0;
     let secret = key::SignedSecretKey::from_asc(include_str!("../test-data/key/alice-secret.asc"))
         .unwrap()
         .0;
+    let public = secret.split_public_key().unwrap();
     KeyPair { public, secret }
 }
 
 /// Load a pre-generated keypair for bob@example.net from disk.
 ///
 /// Like [alice_keypair] but a different key and identity.
 pub fn bob_keypair() -> KeyPair {
-    let public = key::SignedPublicKey::from_asc(include_str!("../test-data/key/bob-public.asc"))
-        .unwrap()
-        .0;
     let secret = key::SignedSecretKey::from_asc(include_str!("../test-data/key/bob-secret.asc"))
         .unwrap()
         .0;
+    let public = secret.split_public_key().unwrap();
     KeyPair { public, secret }
 }
 
 /// Load a pre-generated keypair for charlie@example.net from disk.
 ///
 /// Like [alice_keypair] but a different key and identity.
 pub fn charlie_keypair() -> KeyPair {
-    let public =
-        key::SignedPublicKey::from_asc(include_str!("../test-data/key/charlie-public.asc"))
-            .unwrap()
-            .0;
     let secret =
         key::SignedSecretKey::from_asc(include_str!("../test-data/key/charlie-secret.asc"))
             .unwrap()
             .0;
+    let public = secret.split_public_key().unwrap();
     KeyPair { public, secret }
 }
 
 /// Load a pre-generated keypair for dom@example.net from disk.
 ///
 /// Like [alice_keypair] but a different key and identity.
 pub fn dom_keypair() -> KeyPair {
-    let public = key::SignedPublicKey::from_asc(include_str!("../test-data/key/dom-public.asc"))
-        .unwrap()
-        .0;
     let secret = key::SignedSecretKey::from_asc(include_str!("../test-data/key/dom-secret.asc"))
         .unwrap()
         .0;
+    let public = secret.split_public_key().unwrap();
     KeyPair { public, secret }
 }
 
 /// Load a pre-generated keypair for elena@example.net from disk.
 ///
 /// Like [alice_keypair] but a different key and identity.
 pub fn elena_keypair() -> KeyPair {
-    let public = key::SignedPublicKey::from_asc(include_str!("../test-data/key/elena-public.asc"))
-        .unwrap()
-        .0;
     let secret = key::SignedSecretKey::from_asc(include_str!("../test-data/key/elena-secret.asc"))
         .unwrap()
         .0;
+    let public = secret.split_public_key().unwrap();
     KeyPair { public, secret }
 }
 
 /// Load a pre-generated keypair for fiona@example.net from disk.
 ///
 /// Like [alice_keypair] but a different key and identity.
 pub fn fiona_keypair() -> KeyPair {
-    let public = key::SignedPublicKey::from_asc(include_str!("../test-data/key/fiona-public.asc"))
-        .unwrap()
-        .0;
     let secret = key::SignedSecretKey::from_asc(include_str!("../test-data/key/fiona-secret.asc"))
         .unwrap()
         .0;
+    let public = secret.split_public_key().unwrap();
     KeyPair { public, secret }
 }