openpgp: Remove the openpgp/types module

  - It only contains a KeyId type which is redundant relative to KeyID
    and it is buggy (e.g., when it converts a Key ID to hex, it drops
    any leading zeros).

  - Update users to use KeyID instead.

1 files changed, 3 insertions, 4 deletions

diff --git a/net/src/lib.rs b/net/src/lib.rs
index 651ace16..63ac9c2b 100644
--- a/net/src/lib.rs
+++ b/net/src/lib.rs
@@ -58,8 +58,7 @@ use std::io;
 
 use sequoia_core::{Context, NetworkPolicy};
 use openpgp::tpk::{self, TPK};
-use openpgp::types::KeyId;
-use openpgp::{Message, armor};
+use openpgp::{Message, KeyID, armor};
 
 pub mod ipc;
 
@@ -156,9 +155,9 @@ impl KeyServer {
     }
 
     /// Retrieves the key with the given `keyid`.
-    pub fn get(&mut self, keyid: &KeyId) -> Result<TPK> {
+    pub fn get(&mut self, keyid: &KeyID) -> Result<TPK> {
         let uri = format!("{}/pks/lookup?op=get&options=mr&search=0x{}",
-                          self.uri, keyid.as_hex()).parse()?;
+                          self.uri, keyid.to_hex()).parse()?;
         let result = self.core.run(
             self.client.do_get(uri).and_then(|res| {
                 let status = res.status();