From 3a1de9fbdcaee0993ef3dc804c428e83140c4437 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 25 Nov 2019 17:15:11 +0000
Subject: [PATCH] Rip out more bluebirds AGAIN

---
 src/client.js                                      | 6 ------
 src/crypto/DeviceList.js                           | 1 -
 src/crypto/store/indexeddb-crypto-store-backend.js | 2 --
 src/crypto/store/indexeddb-crypto-store.js         | 2 --
 src/scheduler.js                                   | 1 -
 src/sync.js                                        | 1 -
 6 files changed, 13 deletions(-)

diff --git a/src/client.js b/src/client.js
index 098b3ea6e..7531694ff 100644
--- a/src/client.js
+++ b/src/client.js
@@ -26,7 +26,6 @@ import {sleep} from './utils';
  * @module client
  */
 const EventEmitter = require("events").EventEmitter;
-import Promise from 'bluebird';
 const url = require('url');
 
 const httpApi = require("./http-api");
@@ -55,11 +54,6 @@ import { encodeRecoveryKey, decodeRecoveryKey } from './crypto/recoverykey';
 import { keyFromPassphrase, keyFromAuthData } from './crypto/key_passphrase';
 import { randomString } from './randomstring';
 
-// Disable warnings for now: we use deprecated bluebird functions
-// and need to migrate, but they spam the console with warnings.
-Promise.config({warnings: false});
-
-
 const SCROLLBACK_DELAY_MS = 3000;
 const CRYPTO_ENABLED = isCryptoAvailable();
 const CAPABILITIES_CACHE_MS = 21600000; // 6 hours - an arbitrary value
diff --git a/src/crypto/DeviceList.js b/src/crypto/DeviceList.js
index 8936c4ae3..705ad8ee9 100644
--- a/src/crypto/DeviceList.js
+++ b/src/crypto/DeviceList.js
@@ -23,7 +23,6 @@ limitations under the License.
  * Manages the list of other users' devices
  */
 
-import Promise from 'bluebird';
 import {EventEmitter} from 'events';
 
 import logger from '../logger';
diff --git a/src/crypto/store/indexeddb-crypto-store-backend.js b/src/crypto/store/indexeddb-crypto-store-backend.js
index ede785d00..aeead378e 100644
--- a/src/crypto/store/indexeddb-crypto-store-backend.js
+++ b/src/crypto/store/indexeddb-crypto-store-backend.js
@@ -15,8 +15,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/store/indexeddb-crypto-store.js b/src/crypto/store/indexeddb-crypto-store.js
index 2919fb9ca..68c10aec1 100644
--- a/src/crypto/store/indexeddb-crypto-store.js
+++ b/src/crypto/store/indexeddb-crypto-store.js
@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
-
 import logger from '../../logger';
 import LocalStorageCryptoStore from './localStorage-crypto-store';
 import MemoryCryptoStore from './memory-crypto-store';
diff --git a/src/scheduler.js b/src/scheduler.js
index e69bfb270..85ce50fd3 100644
--- a/src/scheduler.js
+++ b/src/scheduler.js
@@ -20,7 +20,6 @@ limitations under the License.
  * @module scheduler
  */
 const utils = require("./utils");
-import Promise from 'bluebird';
 import logger from './logger';
 
 const DEBUG = false;  // set true to enable console logging.
diff --git a/src/sync.js b/src/sync.js
index c516cdcf9..80302ec1e 100644
--- a/src/sync.js
+++ b/src/sync.js
@@ -25,7 +25,6 @@ limitations under the License.
  * an alternative syncing API, we may want to have a proper syncing interface
  * for HTTP and WS at some point.
  */
-import Promise from 'bluebird';
 const User = require("./models/user");
 const Room = require("./models/room");
 const Group = require('./models/group');