openpgp: Drop Fingerprint::from_hex in favor of FromStr.

  - See #462.

2 files changed, 7 insertions, 7 deletions

diff --git a/store/src/backend/mod.rs b/store/src/backend/mod.rs
index 91803a42..d9a88373 100644
--- a/store/src/backend/mod.rs
+++ b/store/src/backend/mod.rs
@@ -229,7 +229,7 @@ impl node::Server for NodeServer {
                              -> Promise<(), capnp::Error> {
         bind_results!(results);
         let fingerprint = pry!(pry!(params.get()).get_fingerprint());
-        let fingerprint = sry!(Fingerprint::from_hex(fingerprint));
+        let fingerprint: openpgp::Fingerprint = sry!(fingerprint.parse());
         let key_id = sry!(KeyServer::lookup(&self.c, &fingerprint));
 
         pry!(pry!(results.get().get_result()).set_ok(
@@ -335,7 +335,7 @@ impl node::mapping::Server for MappingServer {
         bind_results!(results);
         let params = pry!(params.get());
         let fp = pry!(params.get_fingerprint());
-        let fp = sry!(Fingerprint::from_hex(fp)
+        let fp = sry!(fp.parse()
                       .map_err(|_| node::Error::MalformedFingerprint));
         let label = pry!(params.get_label());
 
@@ -904,7 +904,7 @@ impl KeyServer {
                  ORDER BY keys.update_at LIMIT 1",
             &[&network_policy_u8 as &dyn ToSql, &Timestamp::now()],
             |row| Ok((row.get(0)?, row.get(1)?)))?;
-        let fingerprint = openpgp::Fingerprint::from_hex(&fingerprint)
+        let fingerprint = fingerprint.parse::<openpgp::Fingerprint>()
             .map_err(|_| node::Error::SystemError)?;
 
         let ctx = core::Context::configure()
@@ -1003,7 +1003,7 @@ impl Query for KeyServer {
             "SELECT fingerprint FROM keys WHERE id = ?1",
             &[&self.id], |row| -> rusqlite::Result<String> { row.get(0) })
             .ok()
-            .and_then(|fp| Fingerprint::from_hex(&fp).ok())
+            .and_then(|fp| fp.parse::<openpgp::Fingerprint>().ok())
             .map(|fp| KeyID::from(fp).to_string())
             .unwrap_or(
                 format!("{}::{}", Self::table_name(), self.id())
diff --git a/store/src/lib.rs b/store/src/lib.rs
index dc7cb9a5..1d2d65ac 100644
--- a/store/src/lib.rs
+++ b/store/src/lib.rs
@@ -887,7 +887,7 @@ impl Key {
     /// # let new = Cert::from_bytes(
     /// #     &include_bytes!("../../openpgp/tests/data/keys/testy-new.pgp")[..]).unwrap();
     /// let mapping = Mapping::open(&ctx, REALM_CONTACTS, "default")?;
-    /// let fp = Fingerprint::from_hex("3E8877C877274692975189F5D03F6F865226FE8B").unwrap();
+    /// let fp = "3E8877C877274692975189F5D03F6F865226FE8B".parse().unwrap();
     /// let binding = mapping.add("Testy McTestface", &fp)?;
     /// let key = binding.key()?;
     /// let r = key.import(&old)?;
@@ -1081,7 +1081,7 @@ impl Iterator for BundleIter {
                 self.core.borrow_mut(), request,
                 |r: node::binding_iter::item::Reader|
                 Ok((String::from(r.get_label()?),
-                    openpgp::Fingerprint::from_hex(r.get_fingerprint()?).unwrap(),
+                    r.get_fingerprint().unwrap().parse()?,
                     Binding::new(self.core.clone(), Some(r.get_label()?),
                                  r.get_binding()?))))
         };
@@ -1104,7 +1104,7 @@ impl Iterator for KeyIter {
             make_request_map!(
                 self.core.borrow_mut(), request,
                 |r: node::key_iter::item::Reader|
-                Ok((openpgp::Fingerprint::from_hex(r.get_fingerprint()?).unwrap(),
+                Ok((r.get_fingerprint().unwrap().parse()?,
                     Key::new(self.core.clone(), r.get_key()?))))
         };
         doit().ok()