From 2d1a1130d740eda4b407de8ac1631ce64b0a1dac Mon Sep 17 00:00:00 2001
From: Mahrud Sayrafi <mahrud@berkeley.edu>
Date: Wed, 24 Jan 2018 18:03:48 -0800
Subject: [PATCH] Fixes bug in isRevoked, removes isValidSelfCertificate, adds
 verifyCertificate

---
 test/general/x25519.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/general/x25519.js b/test/general/x25519.js
index 4b35e26d..9f401103 100644
--- a/test/general/x25519.js
+++ b/test/general/x25519.js
@@ -232,9 +232,9 @@ describe('X25519 Cryptography', function () {
       expect(user.selfCertifications[0].verify(
         primaryKey, {userid: user.userId, key: primaryKey}
       )).to.eventually.be.true;
-      expect(user.isValidSelfCertificate(
-        primaryKey, user.selfCertifications[0]
-      )).to.eventually.be.true;
+      expect(user.verifyCertificate(
+        primaryKey, user.selfCertifications[0], [hi.toPublic()]
+      )).to.eventually.equal(openpgp.enums.keyStatus.valid);
 
       var options = {
         userIds: {name: "Bye", email: "bye@good.bye"},
@@ -252,9 +252,9 @@ describe('X25519 Cryptography', function () {
         expect(user.selfCertifications[0].verify(
           bye.primaryKey, {userid: user.userId, key: bye.primaryKey}
         )).to.eventually.be.true;
-        expect(user.isValidSelfCertificate(
-          bye.primaryKey, user.selfCertifications[0]
-        )).to.eventually.be.true;
+        expect(user.verifyCertificate(
+          bye.primaryKey, user.selfCertifications[0], [bye.toPublic()]
+        )).to.eventually.equal(openpgp.enums.keyStatus.valid);
 
         return Promise.all([
           // Hi trusts Bye!