From bc2b1344b75c19bee0d4753a5d397f070a53169b Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sat, 16 Feb 2019 11:05:53 +0100
Subject: [PATCH] Allow proper promise failure (#316)

* Allow proper promise failure

* Remove unneeded dep
---
 packages/util-crypto/package.json                            | 1 -
 .../src/schnorrkel/schnorrkel-js/schnorrkel_js.js            | 5 ++---
 .../src/schnorrkel/schnorrkel-js/schnorrkel_js_bg.js         | 2 +-
 yarn.lock                                                    | 5 -----
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/packages/util-crypto/package.json b/packages/util-crypto/package.json
index 095e1dfbe..0ed153192 100644
--- a/packages/util-crypto/package.json
+++ b/packages/util-crypto/package.json
@@ -29,7 +29,6 @@
   "homepage": "https://github.com/polkadot-js/common/tree/master/packages/util-crypto#readme",
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@parity/schnorrkel-js": "^0.1.2",
     "@polkadot/util": "^0.34.16",
     "@types/bip39": "^2.4.2",
     "@types/webassembly-js-api": "^0.0.2",
diff --git a/packages/util-crypto/src/schnorrkel/schnorrkel-js/schnorrkel_js.js b/packages/util-crypto/src/schnorrkel/schnorrkel-js/schnorrkel_js.js
index 0723fd9bd..adc1b26b9 100644
--- a/packages/util-crypto/src/schnorrkel/schnorrkel-js/schnorrkel_js.js
+++ b/packages/util-crypto/src/schnorrkel/schnorrkel-js/schnorrkel_js.js
@@ -258,7 +258,6 @@ const createPromise = require('./schnorrkel_js_bg');
 const wasmPromise = createPromise(wasmImports);
 
 module.exports.isReady = function () { return !!wasm; }
-module.exports.waitReady = function () { return wasmPromise.then(() => true); }
-
-wasmPromise.then((_wasm) => { wasm = _wasm });
+module.exports.waitReady = function () { return wasmPromise.then(() => !!wasm); }
 
+wasmPromise.then((_wasm) => { wasm = _wasm }).catch(() => {});
diff --git a/packages/util-crypto/src/schnorrkel/schnorrkel-js/schnorrkel_js_bg.js b/packages/util-crypto/src/schnorrkel/schnorrkel-js/schnorrkel_js_bg.js
index 892bd4e0d..a64b0fac4 100644
--- a/packages/util-crypto/src/schnorrkel/schnorrkel-js/schnorrkel_js_bg.js
+++ b/packages/util-crypto/src/schnorrkel/schnorrkel-js/schnorrkel_js_bg.js
@@ -1,7 +1,7 @@
 
 const bytes = require('./schnorrkel_js_wasm');
 
-module.exports = function createExportPromise (wasmImports) {
+module.exports = async function createExportPromise (wasmImports) {
   const imports = {
     './schnorrkel_js': wasmImports
   };
diff --git a/yarn.lock b/yarn.lock
index 8dfdd9424..2d097cbf1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1370,11 +1370,6 @@
     universal-user-agent "^2.0.0"
     url-template "^2.0.8"
 
-"@parity/schnorrkel-js@^0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@parity/schnorrkel-js/-/schnorrkel-js-0.1.2.tgz#08c9663299cbe43d292599a1312a761b2426900f"
-  integrity sha512-eQSCY6kb16Lhnlgdz1FbADo1PEI3Xgp0ApGpNydf0yBEQ6AMVo1YN/4zMA3lFjqnurv9NsAy11OJApailUNneQ==
-
 "@polkadot/dev@^0.24.2":
   version "0.24.2"
   resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.24.2.tgz#3cde72bff3f005c6d268b59bf72163f1670c7cfe"