port to new sequoia API
This commit is contained in:
parent
9d77cc6797
commit
b706b2872a
|
@ -160,7 +160,7 @@ pub trait Database: Sync + Send {
|
||||||
for uid in tpk.userids() {
|
for uid in tpk.userids() {
|
||||||
let email = Email::try_from(uid.userid().clone())?;
|
let email = Email::try_from(uid.userid().clone())?;
|
||||||
|
|
||||||
match uid.revoked() {
|
match uid.revoked(None) {
|
||||||
RevocationStatus::CouldBe(_) | RevocationStatus::Revoked(_) => {
|
RevocationStatus::CouldBe(_) | RevocationStatus::Revoked(_) => {
|
||||||
revoked_uids.push(email);
|
revoked_uids.push(email);
|
||||||
}
|
}
|
||||||
|
|
|
@ -338,7 +338,6 @@ pub fn test_uid_revocation<D: Database>(db: &mut D) {
|
||||||
|
|
||||||
// upload key
|
// upload key
|
||||||
let tokens = db.merge_or_publish(tpk.clone()).unwrap();
|
let tokens = db.merge_or_publish(tpk.clone()).unwrap();
|
||||||
let fpr = Fingerprint::try_from(tpk.fingerprint()).unwrap();
|
|
||||||
|
|
||||||
// verify uid
|
// verify uid
|
||||||
assert_eq!(tokens.len(), 2);
|
assert_eq!(tokens.len(), 2);
|
||||||
|
@ -354,7 +353,7 @@ pub fn test_uid_revocation<D: Database>(db: &mut D) {
|
||||||
// revoke one uid
|
// revoke one uid
|
||||||
let sig = {
|
let sig = {
|
||||||
let uid = tpk.userids().find(|b| *b.userid() == uid2).unwrap();
|
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();
|
let mut keypair = tpk.primary().clone().into_keypair().unwrap();
|
||||||
uid.revoke(&mut keypair,
|
uid.revoke(&mut keypair,
|
||||||
|
|
|
@ -355,7 +355,7 @@ fn lookup(db: rocket::State<Polymorphic>, key: Option<queries::Hkp>)
|
||||||
})
|
})
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
let is_rev =
|
let is_rev =
|
||||||
if tpk.revoked() != RevocationStatus::NotAsFarAsWeKnow {
|
if tpk.revoked(None) != RevocationStatus::NotAsFarAsWeKnow {
|
||||||
"r"
|
"r"
|
||||||
} else {
|
} else {
|
||||||
""
|
""
|
||||||
|
@ -390,7 +390,7 @@ fn lookup(db: rocket::State<Polymorphic>, key: Option<queries::Hkp>)
|
||||||
})
|
})
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
let is_rev =
|
let is_rev =
|
||||||
if uid.revoked() != RevocationStatus::NotAsFarAsWeKnow {
|
if uid.revoked(None) != RevocationStatus::NotAsFarAsWeKnow {
|
||||||
"r"
|
"r"
|
||||||
} else {
|
} else {
|
||||||
""
|
""
|
||||||
|
|
Loading…
Reference in New Issue