Merge pull request #5800 from BitGo/DX-1163-remove-bluebird-from-bitgo-express

refactor(express): replace bluebird with native promises

Author: kev-daniell

modules/express/package.json

@@ -43,7 +43,6 @@
     "@types/proxyquire": "^1.3.31",
     "argparse": "^1.0.10",
     "bitgo": "^42.2.0",
-    "bluebird": "^3.5.3",
     "body-parser": "^1.20.3",
     "connect-timeout": "^1.9.0",
     "debug": "^3.1.0",
@@ -61,7 +60,6 @@
     "@bitgo/sdk-lib-mpc": "^10.1.2",
     "@bitgo/sdk-test": "^8.0.76",
     "@types/argparse": "^1.0.36",
-    "@types/bluebird": "^3.5.25",
     "@types/body-parser": "^1.17.0",
     "@types/express": "4.17.13",
     "@types/lodash": "^4.14.121",

modules/express/test/unit/bitgoExpress.ts

@@ -12,7 +12,6 @@ import * as https from 'https';
 import * as debugLib from 'debug';
 import * as path from 'path';
 import { Environments } from 'bitgo';
-import { coroutine as co } from 'bluebird';
 
 import { SSL_OP_NO_TLSv1 } from 'constants';
 import { TlsConfigurationError, NodeEnvironmentError } from '../../src/errors';
@@ -112,50 +111,44 @@ describe('Bitgo Express', function () {
       (() => expressApp(args)).should.throw(TlsConfigurationError);
     });
 
-    it(
-      'should create an http server when not using TLS',
-      co(function* () {
-        const createServerStub = sinon.stub(http, 'createServer');
+    it('should create an http server when not using TLS', async function () {
+      const createServerStub = sinon.stub(http, 'createServer');
 
-        const args: any = {
-          env: 'prod',
-          bind: 'localhost',
-        };
+      const args: any = {
+        env: 'prod',
+        bind: 'localhost',
+      };
 
-        createServer(args, null as any);
+      createServer(args, null as any);
 
-        createServerStub.should.be.calledOnce();
-        createServerStub.restore();
-      })
-    );
-
-    it(
-      'should create an https server when using TLS',
-      co(function* () {
-        const createServerStub = sinon.stub(https, 'createServer');
-        const readFileAsyncStub = sinon
-          .stub(fs.promises, 'readFile' as any)
-          .onFirstCall()
-          .resolves('key')
-          .onSecondCall()
-          .resolves('cert');
-
-        const args: any = {
-          env: 'prod',
-          bind: '1.2.3.4',
-          crtPath: '/tmp/crt.pem',
-          keyPath: '/tmp/key.pem',
-        };
-
-        yield createServer(args, null as any);
+      createServerStub.should.be.calledOnce();
+      createServerStub.restore();
+    });
 
-        https.createServer.should.be.calledOnce();
-        https.createServer.should.be.calledWith({ secureOptions: SSL_OP_NO_TLSv1, key: 'key', cert: 'cert' });
+    it('should create an https server when using TLS', async function () {
+      const createServerStub = sinon.stub(https, 'createServer');
+      const readFileAsyncStub = sinon
+        .stub(fs.promises, 'readFile' as any)
+        .onFirstCall()
+        .resolves('key')
+        .onSecondCall()
+        .resolves('cert');
 
-        createServerStub.restore();
-        readFileAsyncStub.restore();
-      })
-    );
+      const args: any = {
+        env: 'prod',
+        bind: '1.2.3.4',
+        crtPath: '/tmp/crt.pem',
+        keyPath: '/tmp/key.pem',
+      };
+
+      await createServer(args, null as any);
+
+      https.createServer.should.be.calledOnce();
+      https.createServer.should.be.calledWith({ secureOptions: SSL_OP_NO_TLSv1, key: 'key', cert: 'cert' });
+
+      createServerStub.restore();
+      readFileAsyncStub.restore();
+    });
 
     it('should create https server with sslkey and sslcert', async () => {
       const createServerStub = sinon.stub(https, 'createServer');

modules/express/test/unit/clientRoutes/generateWallet.ts

@@ -1,5 +1,4 @@
 import * as sinon from 'sinon';
-import * as Bluebird from 'bluebird';
 
 import 'should-http';
 import 'should-sinon';
@@ -15,7 +14,7 @@ import { BaseCoin, Wallets, WalletWithKeychains } from '@bitgo/sdk-core';
 describe('Generate Wallet', () => {
   it('should return the internal wallet object and keychains by default or if includeKeychains is true', async () => {
     const walletStub = sinon
-      .stub<[], Bluebird<WalletWithKeychains>>()
+      .stub<[], Promise<WalletWithKeychains>>()
       .resolves({ wallet: { toJSON: () => 'walletdata with keychains' } } as any);
     const walletsStub = sinon.createStubInstance(Wallets, { generateWallet: walletStub });
     const coinStub = sinon.createStubInstance(BaseCoin, {

yarn.lock

@@ -135,10 +135,10 @@
     regexpu-core "^6.2.0"
     semver "^6.3.1"
 
-"@babel/helper-define-polyfill-provider@^0.6.3":
-  version "0.6.3"
-  resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz#f4f2792fae2ef382074bc2d713522cf24e6ddb21"
-  integrity sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==
+"@babel/helper-define-polyfill-provider@^0.6.3", "@babel/helper-define-polyfill-provider@^0.6.4":
+  version "0.6.4"
+  resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.4.tgz#15e8746368bfa671785f5926ff74b3064c291fab"
+  integrity sha512-jljfR1rGnXXNWnmQg2K3+bvhkxB51Rl32QRaOTuwwjviGrHzIbSc8+x9CpraDtbT7mfyjXObULP4w/adunNwAw==
   dependencies:
     "@babel/helper-compilation-targets" "^7.22.6"
     "@babel/helper-plugin-utils" "^7.22.5"
@@ -4989,9 +4989,9 @@
   integrity sha512-t66jwrXA0s5Goq82ZtjagLNd7DPGCNjHeehRlE/gcJmJ+G56C0W+2plqOMRicJ8XGR1/YFnUSEqUFiSNbjGrAA==
 
 "@substrate/connect-known-chains@^1.1.5":
-  version "1.9.2"
-  resolved "https://registry.npmjs.org/@substrate/connect-known-chains/-/connect-known-chains-1.9.2.tgz#9cbed20cf03091f28fc4319fe2419f735729ce52"
-  integrity sha512-uEmm+rKJQQhhbforvmcg74TsDHKFVBkstjPwblGT1RdHMxUKR7Gq7F8vbkGnr5ce9tMK2Ylil760Z7vtX013hw==
+  version "1.9.3"
+  resolved "https://registry.npmjs.org/@substrate/connect-known-chains/-/connect-known-chains-1.9.3.tgz#f6adbe74374f711ef1d624641555be7f28cbf4ad"
+  integrity sha512-CPcykiKcVuG4J424gNUFak4AdIJ1sXbu/Bk1IGVPOz74NlBO8EvUyRlpPA7IY0vEf7/n4HQ1gEN5lfgERo4q3w==
 
 "@substrate/[email protected]":
   version "0.8.11"
@@ -5198,11 +5198,6 @@
   resolved "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz#1a31c3d378850d2778dabb6374d036dcba4ba708"
   integrity sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==
 
-"@types/bluebird@^3.5.25":
-  version "3.5.42"
-  resolved "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.42.tgz#7ec05f1ce9986d920313c1377a5662b1b563d366"
-  integrity sha512-Jhy+MWRlro6UjVi578V/4ZGNfeCOcNCp0YaFNIUGFKlImowqwb1O/22wDVk3FDGMLqxdpOV3qQHD5fPEH4hK6A==
-
 "@types/bn.js@*", "@types/bn.js@^5.1.0", "@types/bn.js@^5.1.6":
   version "5.1.6"
   resolved "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.6.tgz#9ba818eec0c85e4d3c679518428afdf611d03203"
@@ -6913,12 +6908,12 @@ babel-loader@^9.1.0:
     schema-utils "^4.0.0"
 
 babel-plugin-polyfill-corejs2@^0.4.10:
-  version "0.4.12"
-  resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz#ca55bbec8ab0edeeef3d7b8ffd75322e210879a9"
-  integrity sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==
+  version "0.4.13"
+  resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.13.tgz#7d445f0e0607ebc8fb6b01d7e8fb02069b91dd8b"
+  integrity sha512-3sX/eOms8kd3q2KZ6DAhKPc0dgm525Gqq5NtWKZ7QYYZEv57OQ54KtblzJzH1lQF/eQxO8KjWGIK9IPUJNus5g==
   dependencies:
     "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.6.3"
+    "@babel/helper-define-polyfill-provider" "^0.6.4"
     semver "^6.3.1"
 
 babel-plugin-polyfill-corejs3@^0.11.0:
@@ -6930,11 +6925,11 @@ babel-plugin-polyfill-corejs3@^0.11.0:
     core-js-compat "^3.40.0"
 
 babel-plugin-polyfill-regenerator@^0.6.1:
-  version "0.6.3"
-  resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz#abeb1f3f1c762eace37587f42548b08b57789bc8"
-  integrity sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==
+  version "0.6.4"
+  resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.4.tgz#428c615d3c177292a22b4f93ed99e358d7906a9b"
+  integrity sha512-7gD3pRadPrbjhjLyxebmx/WrFYcuSjZ0XbdUujQMZ/fcE9oeewk2U/7PCvez84UeuK3oSjmPZ0Ch0dlupQvGzw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.6.3"
+    "@babel/helper-define-polyfill-provider" "^0.6.4"
 
 "babel-plugin-styled-components@>= 1.12.0":
   version "2.1.4"
@@ -14456,9 +14451,9 @@ [email protected]:
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
 "mime-db@>= 1.43.0 < 2":
-  version "1.53.0"
-  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz#3cb63cd820fc29896d9d4e8c32ab4fcd74ccb447"
-  integrity sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==
+  version "1.54.0"
+  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz#cddb3ee4f9c64530dff640236661d42cb6a314f5"
+  integrity sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==
 
 mime-types@^2.1.12, mime-types@^2.1.16, mime-types@^2.1.25, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@^2.1.35, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
@@ -14924,9 +14919,9 @@ [email protected]:
   integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==
 
 nanoid@^3.3.8:
-  version "3.3.10"
-  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.10.tgz#7bc882237698ef787d5cbba109e3b0168ba6e7b1"
-  integrity sha512-vSJJTG+t/dIKAUhUDw/dLdZ9s//5OxcHqLaDWWrW4Cdq7o6tdLIczUkMXt2MBNmk6sJRZBZRXVixs7URY1CmIg==
+  version "3.3.11"
+  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
+  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
 
 natural-compare@^1.4.0:
   version "1.4.0"