diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2019-11-26 13:04:47 +0100 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2019-11-26 14:29:29 +0100 |
commit | b24d1c5a099e2c741cf724816d49b8dd7977e049 (patch) | |
tree | 0288feb61d74b61acc39045a5e2b31551eb7b131 /store | |
parent | 33fd6f48682b15e140d479574ec3377610acb22d (diff) |
openpgp: Implement From<Fingerprint> for KeyID.
- Remove Fingerprint::to_keyid, use From instead.
Diffstat (limited to 'store')
-rw-r--r-- | store/src/backend/mod.rs | 6 | ||||
-rw-r--r-- | store/src/lib.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/store/src/backend/mod.rs b/store/src/backend/mod.rs index 1ed41288..2ed0458a 100644 --- a/store/src/backend/mod.rs +++ b/store/src/backend/mod.rs @@ -348,7 +348,7 @@ impl node::mapping::Server for MappingServer { &self.c, log::Refers::to().mapping(self.id).binding(binding_id).key(key_id), &self.slug(), - &format!("New binding {} -> {}", label, fp.to_keyid()))); + &format!("New binding {} -> {}", label, KeyID::from(fp)))); } @@ -913,7 +913,7 @@ impl KeyServer { let keyserver = net::KeyServer::keys_openpgp_org(&ctx)?; Ok((KeyServer::new(c.clone(), id), - fingerprint.to_keyid(), + fingerprint.into(), keyserver)) } @@ -1005,7 +1005,7 @@ impl Query for KeyServer { &[&self.id], |row| -> rusqlite::Result<String> { row.get(0) }) .ok() .and_then(|fp| Fingerprint::from_hex(&fp).ok()) - .map(|fp| fp.to_keyid().to_string()) + .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 c24cd0d3..29aff727 100644 --- a/store/src/lib.rs +++ b/store/src/lib.rs @@ -229,7 +229,7 @@ impl Store { /// # let tpk = TPK::from_bytes( /// # &include_bytes!("../../openpgp/tests/data/keys/testy.pgp")[..]).unwrap(); /// Store::import(&ctx, &tpk)?; - /// let key = Store::lookup_by_keyid(&ctx, &tpk.fingerprint().to_keyid())?; + /// let key = Store::lookup_by_keyid(&ctx, &tpk.fingerprint().into())?; /// assert_eq!(key.tpk()?.fingerprint(), tpk.fingerprint()); /// # Ok(()) /// # } |