From efcaadd0b4492f7e8ce5b0622910f96107ce7c83 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 25 Nov 2019 16:58:46 +0000
Subject: [PATCH] Rip out more bluebirds

---
 src/crypto/OutgoingRoomKeyRequestManager.js | 2 --
 src/crypto/algorithms/base.js               | 2 --
 src/crypto/algorithms/megolm.js             | 2 +-
 src/crypto/algorithms/olm.js                | 3 ---
 src/crypto/olmlib.js                        | 1 -
 src/utils.js                                | 1 -
 6 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/crypto/OutgoingRoomKeyRequestManager.js b/src/crypto/OutgoingRoomKeyRequestManager.js
index 3af19f3c9..ef435e9c8 100644
--- a/src/crypto/OutgoingRoomKeyRequestManager.js
+++ b/src/crypto/OutgoingRoomKeyRequestManager.js
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
-
 import logger from '../logger';
 import utils from '../utils';
 
diff --git a/src/crypto/algorithms/base.js b/src/crypto/algorithms/base.js
index 40c60a439..d5e38f477 100644
--- a/src/crypto/algorithms/base.js
+++ b/src/crypto/algorithms/base.js
@@ -20,8 +20,6 @@ limitations under the License.
  * @module
  */
 
-import Promise from 'bluebird';
-
 /**
  * map of registered encryption algorithm classes. A map from string to {@link
  * module:crypto/algorithms/base.EncryptionAlgorithm|EncryptionAlgorithm} class
diff --git a/src/crypto/algorithms/megolm.js b/src/crypto/algorithms/megolm.js
index 367ef6ae2..8fb7c7962 100644
--- a/src/crypto/algorithms/megolm.js
+++ b/src/crypto/algorithms/megolm.js
@@ -508,7 +508,7 @@ MegolmEncryption.prototype.reshareKeyWithDevice = async function(
         userId,
         device,
         payload,
-    ),
+    );
 
     await this._baseApis.sendToDevice("m.room.encrypted", {
         [userId]: {
diff --git a/src/crypto/algorithms/olm.js b/src/crypto/algorithms/olm.js
index 93d651d49..25fb21d94 100644
--- a/src/crypto/algorithms/olm.js
+++ b/src/crypto/algorithms/olm.js
@@ -20,15 +20,12 @@ limitations under the License.
  *
  * @module crypto/algorithms/olm
  */
-import Promise from 'bluebird';
-
 import logger from '../../logger';
 const utils = require("../../utils");
 const olmlib = require("../olmlib");
 const DeviceInfo = require("../deviceinfo");
 const DeviceVerification = DeviceInfo.DeviceVerification;
 
-
 const base = require("./base");
 
 /**
diff --git a/src/crypto/olmlib.js b/src/crypto/olmlib.js
index 4af8e035d..47677b102 100644
--- a/src/crypto/olmlib.js
+++ b/src/crypto/olmlib.js
@@ -21,7 +21,6 @@ limitations under the License.
  * Utilities common to olm encryption algorithms
  */
 
-import Promise from 'bluebird';
 const anotherjson = require('another-json');
 
 import logger from '../logger';
diff --git a/src/utils.js b/src/utils.js
index 11887c801..e50794cc7 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -21,7 +21,6 @@ limitations under the License.
  */
 
 const unhomoglyph = require('unhomoglyph');
-// import Promise from 'bluebird';
 
 /**
  * Encode a dictionary of query parameters.