From a5fdc360624defb1b0b5b732f804ca21e080a73f Mon Sep 17 00:00:00 2001
From: evilaliv3 <giovanni.pellerano@evilaliv3.org>
Date: Wed, 27 Apr 2016 16:06:52 +0200
Subject: [PATCH] Cleanup API for key.decrypt and align unit tests

---
 src/key.js          | 3 ---
 test/general/key.js | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/key.js b/src/key.js
index ecae8af0..641c8a17 100644
--- a/src/key.js
+++ b/src/key.js
@@ -368,7 +368,6 @@ Key.prototype.getEncryptionKeyPacket = function() {
 /**
  * Encrypts all secret key and subkey packets
  * @param  {String} passphrase
- * @return {Boolean} true if all key and subkey packets encrypted successfully
  */
 Key.prototype.encrypt = function(passphrase) {
   if (this.isPrivate()) {
@@ -376,8 +375,6 @@ Key.prototype.encrypt = function(passphrase) {
     for (var i = 0; i < keys.length; i++) {
       keys[i].encrypt(passphrase);
     }
-  } else {
-    throw new Error("Nothing to encrypt in a public key");
   }
 };
 
diff --git a/test/general/key.js b/test/general/key.js
index 19c39e29..34262885 100644
--- a/test/general/key.js
+++ b/test/general/key.js
@@ -717,7 +717,7 @@ var pgp_desktop_priv =
       expect(armor1).to.equal(armor2);
       expect(key.decrypt('passphrase')).to.be.true;
       expect(key.primaryKey.isDecrypted).to.be.true;
-      expect(key.encrypt('new_passphrase')).to.be.true;
+      key.encrypt('new_passphrase');
       expect(key.primaryKey.isDecrypted).to.be.false;
       expect(key.decrypt('passphrase')).to.be.false;
       expect(key.primaryKey.isDecrypted).to.be.false;