Remove cert_by_id() from ca.rs

2 files changed, 27 insertions, 12 deletions

diff --git a/src/ca.rs b/src/ca.rs
index abd81da..a4a7d7e 100644
--- a/src/ca.rs
+++ b/src/ca.rs
@@ -321,11 +321,6 @@ impl OpenpgpCa {
         self.db.get_cert(&norm)
     }
 
-    /// Get a Cert by id
-    pub fn cert_by_id(&self, cert_id: i32) -> Result<Option<models::Cert>> {
-        self.db.get_cert_by_id(cert_id)
-    }
-
     /// Get a list of all Certs for one User
     pub fn get_certs_by_user(
         &self,
@@ -687,8 +682,8 @@ impl OpenpgpCa {
 
         for bridge in bridges {
             println!("Bridge to '{}'", bridge.email);
-            if let Some(cert) = self.cert_by_id(bridge.cert_id)? {
-                println!("{}", cert.pub_cert);
+            if let Some(db_cert) = self.db.get_cert_by_id(bridge.cert_id)? {
+                println!("{}", db_cert.pub_cert);
             }
             println!();
         }
diff --git a/tests/test_gpg.rs b/tests/test_gpg.rs
index 2f54337..59d47ad 100644
--- a/tests/test_gpg.rs
+++ b/tests/test_gpg.rs
@@ -275,14 +275,22 @@ fn test_bridge() -> Result<()> {
     let bridges2 = ca2.bridges_get()?;
     assert_eq!(bridges2.len(), 1);
 
-    let ca1_cert = ca2.cert_by_id(bridges2[0].cert_id)?.unwrap().pub_cert;
+    let ca1_cert = ca2
+        .db()
+        .get_cert_by_id(bridges2[0].cert_id)?
+        .unwrap()
+        .pub_cert;
 
     // get Cert for ca2 from ca1 bridge
     // (this has the signed version of the ca2 pubkey)
     let bridges1 = ca1.bridges_get()?;
     assert_eq!(bridges1.len(), 1);
 
-    let ca2_cert = ca1.cert_by_id(bridges1[0].cert_id)?.unwrap().pub_cert;
+    let ca2_cert = ca1
+        .db()
+        .get_cert_by_id(bridges1[0].cert_id)?
+        .unwrap()
+        .pub_cert;
 
     // import CA keys into GnuPG
     gnupg::import(&ctx, ca1_cert.as_bytes());
@@ -405,13 +413,21 @@ fn test_multi_bridge() -> Result<()> {
     // (this has the signed version of the ca2 pubkey)
     let bridges1 = ca1.bridges_get()?;
     assert_eq!(bridges1.len(), 1);
-    let ca2_cert = ca1.cert_by_id(bridges1[0].cert_id)?.unwrap().pub_cert;
+    let ca2_cert = ca1
+        .db()
+        .get_cert_by_id(bridges1[0].cert_id)?
+        .unwrap()
+        .pub_cert;
 
     // get Cert for ca3 from ca2 bridge
     // (this has the tsig from ca3)
     let bridges2 = ca2.bridges_get()?;
     assert_eq!(bridges2.len(), 1);
-    let ca3_cert = ca2.cert_by_id(bridges2[0].cert_id)?.unwrap().pub_cert;
+    let ca3_cert = ca2
+        .db()
+        .get_cert_by_id(bridges2[0].cert_id)?
+        .unwrap()
+        .pub_cert;
 
     // import CA certs into GnuPG
     gnupg::import(&ctx, ca1_cert.as_bytes());
@@ -532,7 +548,11 @@ fn test_scoping() -> Result<()> {
     // (this has the signed version of the ca2 pubkey)
     let bridges1 = ca1.bridges_get()?;
     assert_eq!(bridges1.len(), 1);
-    let ca2_cert = ca1.cert_by_id(bridges1[0].cert_id)?.unwrap().pub_cert;
+    let ca2_cert = ca1
+        .db()
+        .get_cert_by_id(bridges1[0].cert_id)?
+        .unwrap()
+        .pub_cert;
 
     // import CA certs into GnuPG
     gnupg::import(&ctx, Pgp::cert_to_armored(&ca1_cert)?.as_bytes());