diff --git a/src/database/mod.rs b/src/database/mod.rs index 66942f1..5e1ef52 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -160,7 +160,7 @@ pub trait Database: Sync + Send { for uid in tpk.userids() { let email = Email::try_from(uid.userid().clone())?; - match uid.revoked() { + match uid.revoked(None) { RevocationStatus::CouldBe(_) | RevocationStatus::Revoked(_) => { revoked_uids.push(email); } diff --git a/src/database/test.rs b/src/database/test.rs index 0a7b216..a40120f 100644 --- a/src/database/test.rs +++ b/src/database/test.rs @@ -338,7 +338,6 @@ pub fn test_uid_revocation(db: &mut D) { // upload key let tokens = db.merge_or_publish(tpk.clone()).unwrap(); - let fpr = Fingerprint::try_from(tpk.fingerprint()).unwrap(); // verify uid assert_eq!(tokens.len(), 2); @@ -354,7 +353,7 @@ pub fn test_uid_revocation(db: &mut D) { // revoke one uid let sig = { let uid = tpk.userids().find(|b| *b.userid() == uid2).unwrap(); - assert_eq!(RevocationStatus::NotAsFarAsWeKnow, uid.revoked()); + assert_eq!(RevocationStatus::NotAsFarAsWeKnow, uid.revoked(None)); let mut keypair = tpk.primary().clone().into_keypair().unwrap(); uid.revoke(&mut keypair, diff --git a/src/web/mod.rs b/src/web/mod.rs index e902462..4ba85a6 100644 --- a/src/web/mod.rs +++ b/src/web/mod.rs @@ -355,7 +355,7 @@ fn lookup(db: rocket::State, key: Option) }) .unwrap_or_default(); let is_rev = - if tpk.revoked() != RevocationStatus::NotAsFarAsWeKnow { + if tpk.revoked(None) != RevocationStatus::NotAsFarAsWeKnow { "r" } else { "" @@ -390,7 +390,7 @@ fn lookup(db: rocket::State, key: Option) }) .unwrap_or_default(); let is_rev = - if uid.revoked() != RevocationStatus::NotAsFarAsWeKnow { + if uid.revoked(None) != RevocationStatus::NotAsFarAsWeKnow { "r" } else { ""