From 30f525ee2a7b92f17878704f4bcc3cafe6006dde Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Fri, 24 Aug 2018 14:59:49 +0200
Subject: openpgp: Make functions parsing key ids, fingerprints return Result.

  - Fixes #13.
---
 store/src/backend/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'store/src')

diff --git a/store/src/backend/mod.rs b/store/src/backend/mod.rs
index fbe3bb21..0079a443 100644
--- a/store/src/backend/mod.rs
+++ b/store/src/backend/mod.rs
@@ -261,7 +261,7 @@ impl node::store::Server for StoreServer {
         let params = pry!(params.get());
         let fp = pry!(params.get_fingerprint());
         let fp = sry!(Fingerprint::from_hex(fp)
-                      .ok_or(node::Error::MalformedFingerprint));
+                      .map_err(|_| node::Error::MalformedFingerprint));
         let label = pry!(params.get_label());
 
         let (binding_id, key_id, created) = sry!(
@@ -739,7 +739,7 @@ impl KeyServer {
             &[&network_policy_u8, &Timestamp::now()], |row| (row.get(0),
                                                              row.get(1)))?;
         let fingerprint = openpgp::Fingerprint::from_hex(&fingerprint)
-            .ok_or(node::Error::SystemError)?;
+            .map_err(|_| node::Error::SystemError)?;
 
         let ctx = core::Context::configure("org.sequoia-pgp.store")
             .network_policy(network_policy).build()?;
@@ -840,7 +840,7 @@ impl Query for KeyServer {
             "SELECT fingerprint FROM keys WHERE id = ?1",
             &[&self.id], |row| -> String { row.get(0) })
             .ok()
-            .and_then(|fp| Fingerprint::from_hex(&fp))
+            .and_then(|fp| Fingerprint::from_hex(&fp).ok())
             .map(|fp| fp.to_keyid().to_string())
             .unwrap_or(
                 format!("{}::{}", Self::table_name(), self.id())
-- 
cgit v1.2.3