From ddedb5cb42f57db6d5f47ea3b8a5dae429baa04a Mon Sep 17 00:00:00 2001
From: Tankred Hase <mail@tankredhase.de>
Date: Wed, 23 Mar 2016 21:36:48 +0800
Subject: [PATCH] Cleanup public api

---
 src/openpgp.js          | 20 +++++---------------
 test/general/openpgp.js | 19 -------------------
 2 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/src/openpgp.js b/src/openpgp.js
index c881b959..470bc3e7 100644
--- a/src/openpgp.js
+++ b/src/openpgp.js
@@ -109,18 +109,7 @@ export function generateKey({ userIds=[], passphrase, numBits=2048, unlocked=fal
     privateKeyArmored: newKey.armor(),
     publicKeyArmored: newKey.toPublic().armor()
 
-  })).catch(err => {
-
-    // js fallback already tried
-    if (config.debug) { console.error(err); }
-    if (!util.getWebCryptoAll()) {
-      throw new Error('Error generating keypair using js fallback');
-    }
-    // fall back to js keygen in a worker
-    if (config.debug) { console.log('Error generating keypair using native WebCrypto... falling back back to js'); }
-    return asyncProxy.delegate('generateKey', options);
-
-  }).catch(onError.bind(null, 'Error generating keypair'));
+  })).catch(onError.bind(null, 'Error generating keypair'));
 }
 
 /**
@@ -173,14 +162,15 @@ export function encrypt({ data, publicKeys, privateKeys, passwords, filename, ar
     return asyncProxy.delegate('encrypt', { data, publicKeys, privateKeys, passwords, filename, armor });
   }
 
-  return new Promise(resolve => {
+  return new Promise(resolve => resolve()).then(() => {
+
     let message = createMessage(data, filename);
     if (privateKeys) { // sign the message only if private keys are specified
       message = message.sign(privateKeys);
     }
-    resolve(message);
+    return message.encrypt(publicKeys, passwords);
 
-  }).then(message => message.encrypt(publicKeys, passwords)).then(message => {
+  }).then(message => {
 
     if(armor) {
       return {
diff --git a/test/general/openpgp.js b/test/general/openpgp.js
index d42cbaa9..5a03b3e7 100644
--- a/test/general/openpgp.js
+++ b/test/general/openpgp.js
@@ -339,25 +339,6 @@ describe('OpenPGP.js public api tests', function() {
       expect(proxyGenStub.calledOnce).to.be.true;
       expect(keyGenStub.calledOnce).to.be.false;
     });
-
-    it('should delegate to async proxy after web crypto failure', function(done) {
-      var workerStub = {
-        postMessage: function() {}
-      };
-      openpgp.initWorker({
-        worker: workerStub
-      });
-      var proxyGenStub = sinon.stub(openpgp.getWorker(), 'delegate').returns(resolves('proxy_key'));
-      getWebCryptoAllStub.returns({});
-      keyGenStub.returns(rejects(new Error('Native webcrypto keygen failed on purpose :)')));
-
-      openpgp.generateKey().then(function(newKey) {
-        expect(keyGenStub.calledOnce).to.be.true;
-        expect(proxyGenStub.calledOnce).to.be.true;
-        expect(newKey).to.equal('proxy_key');
-        done();
-      });
-    });
   });
 
   describe('generateKey - integration tests', function() {