git.delta.rocks / unique-network / refs/commits / d02af7b15c14

--- a/tests/package-lock.json
+++ b/tests/package-lock.json
@@ -4538,6 +4538,15 @@
       "integrity": "sha512-aN5IAC8QNtSUdQzxu7lGBgYAOuU1tmRU4c9dIq5OKGf/SBVjXo+ffM2wEjudAWbgpOhy60nLoAGH1xm8fpCKFQ==",
       "dev": true
     },
+    "@types/chai-as-promised": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.3.tgz",
+      "integrity": "sha512-FQnh1ohPXJELpKhzjuDkPLR2BZCAqed+a6xV4MI/T3XzHfd2FlarfUGUdZYgqYe8oxkYn0fchHEeHfHqdZ96sg==",
+      "dev": true,
+      "requires": {
+        "@types/chai": "*"
+      }
+    },
     "@types/chrome": {
       "version": "0.0.122",
       "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.0.122.tgz",
@@ -6952,6 +6961,14 @@
         "type-detect": "^4.0.5"
       }
     },
+    "chai-as-promised": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz",
+      "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==",
+      "requires": {
+        "check-error": "^1.0.2"
+      }
+    },
     "chalk": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
@@ -6976,8 +6993,7 @@
     "check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
-      "dev": true
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII="
     },
     "chokidar": {
       "version": "2.1.8",

--- a/tests/package.json
+++ b/tests/package.json
@@ -8,6 +8,7 @@
     "@polkadot/ts": "^0.3.41",
     "@types/bn.js": "^4.11.6",
     "@types/chai": "^4.2.12",
+    "@types/chai-as-promised": "^7.1.3",
     "@types/mocha": "^8.0.3",
     "chai": "^4.2.0",
     "mocha": "^8.1.1",
@@ -25,7 +26,8 @@
     "@polkadot/api": "^1.31.2",
     "@polkadot/types": "^1.31.2",
     "@polkadot/util": "^2.18.1",
-    "@types/bn.js": "^4.11.6"
+    "@types/bn.js": "^4.11.6",
+    "chai-as-promised": "^7.1.1"
   },
   "standard": {
     "globals": [

1import {expect} from 'chai';1import usingApi from "./substrate/substrate-api";
2import { WsProvider } from '@polkadot/api';
3import * as chai from 'chai';
2import usingApi from "./substrate/substrate-api";4import chaiAsPromised from 'chai-as-promised';
5
6chai.use(chaiAsPromised);
7
8const expect = chai.expect;
39
4describe('Connection', () => {10describe('Connection', () => {
5  it('Connection can be established', async () => {11  it('Connection can be established', async () => {
9    });15    });
10  });16  });
17
18  it('Cannot connect to 0.0.0.0', () => {
19    const neverConnectProvider = new WsProvider('ws://0.0.0.0:9944');
20    expect((async () => {
21      await usingApi(async api => {
22        const health = await api.rpc.system.health();
23      }, { provider: neverConnectProvider });
24    })()).to.be.eventually.rejected;
25  });
11});26});

--- a/tests/src/substrate/substrate-api.ts
+++ b/tests/src/substrate/substrate-api.ts
@@ -3,13 +3,17 @@
 import promisifySubstrate from "./promisify-substrate";
 import { ApiOptions } from "@polkadot/api/types";
 
-export default async function usingApi(action: (api: ApiPromise) => Promise<void>): Promise<void> {
+function defaultApiOptions(): ApiOptions {
   const wsProvider = new WsProvider(config.substrateUrl);
-  const settings: ApiOptions = { provider: wsProvider, types: JSON.parse(config.customTypes) };
+  return { provider: wsProvider, types: JSON.parse(config.customTypes) };
+}
+
+export default async function usingApi(action: (api: ApiPromise) => Promise<void>, settings: ApiOptions | undefined = undefined): Promise<void> {
+  settings = settings || defaultApiOptions();
   let api: ApiPromise | undefined = undefined;
 
   try {
-    api = await ApiPromise.create(settings);
+    api = new ApiPromise(settings);
     await promisifySubstrate(api, () => api && api.isReady)();
     await action(api);
   } finally {