diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2018-08-24 14:59:49 +0200 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2018-08-24 14:59:49 +0200 |
| commit | 30f525ee2a7b92f17878704f4bcc3cafe6006dde (patch) | |
| tree | 5784f8f6bd38e14fb3cd7ba063d55d762c331297 /store/src | |
| parent | e0f20bbf1462957277119607ca2c0424fc657885 (diff) | |
openpgp: Make functions parsing key ids, fingerprints return Result.
- Fixes #13.
Diffstat (limited to 'store/src')
| -rw-r--r-- | store/src/backend/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
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()) |