summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2020-04-02 10:35:11 +0200
committerJustus Winter <justus@sequoia-pgp.org>2020-04-02 10:35:11 +0200
commitc75a4d60e6a10b3559370498a99ab946f6846043 (patch)
tree3d24bf9c881d95661c298ab6485dbadc888f051f /net
parent779839516db95a9f8498da25cdf4e965f6e10027 (diff)
openpgp: Drop KeyID::from_hex in favor of FromStr.
- See #462.
Diffstat (limited to 'net')
-rw-r--r--net/src/lib.rs2
-rw-r--r--net/tests/hkp.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/src/lib.rs b/net/src/lib.rs
index 4e7c4655..17c790aa 100644
--- a/net/src/lib.rs
+++ b/net/src/lib.rs
@@ -27,7 +27,7 @@
//! let mut core = Core::new().unwrap();
//! let ctx = Context::new()?;
//! let mut ks = KeyServer::keys_openpgp_org(&ctx)?;
-//! let keyid = KeyID::from_hex("31855247603831FD").unwrap();
+//! let keyid = "31855247603831FD".parse().unwrap();
//! println!("{:?}", core.run(ks.get(&keyid)));
//! Ok(())
//! # }
diff --git a/net/tests/hkp.rs b/net/tests/hkp.rs
index 0a2121f0..889aeaae 100644
--- a/net/tests/hkp.rs
+++ b/net/tests/hkp.rs
@@ -26,7 +26,7 @@ extern crate sequoia_net;
use crate::openpgp::armor::Reader;
use crate::openpgp::Cert;
-use crate::openpgp::{Fingerprint, KeyID};
+use crate::openpgp::Fingerprint;
use crate::openpgp::parse::Parse;
use sequoia_core::{Context, NetworkPolicy};
use sequoia_net::KeyServer;
@@ -155,7 +155,7 @@ fn get() {
let mut keyserver =
KeyServer::new(&ctx, &format!("hkp://{}", addr)).unwrap();
- let keyid = KeyID::from_hex(ID).unwrap();
+ let keyid = ID.parse().unwrap();
let key = core.run(keyserver.get(&keyid)).unwrap();
assert_eq!(key.fingerprint(),