@acala-network/chopsticks-testing 0.8.0-4 → 0.8.0-6

package/lib/check.js

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkHrmp = exports.checkUmp = exports.checkSystemEvents = exports.checkEvents = exports.check = exports.Checker = void 0;
-const vitest_1 = require("vitest");
+import { expect } from 'vitest';
 const processCodecOrArray = (codec, fn) => Array.isArray(codec) ? codec.map(fn) : fn(codec);
 const toHuman = (codec) => processCodecOrArray(codec, (c) => c?.toHuman?.() ?? c);
 const toHex = (codec) => processCodecOrArray(codec, (c) => c?.toHex?.() ?? c);
 const toJson = (codec) => processCodecOrArray(codec, (c) => c?.toJSON?.() ?? c);
-class Checker {
+export class Checker {
     #value;
     #pipeline = [];
     #format = 'json';
@@ -148,11 +145,10 @@ class Checker {
         return value;
     }
     async toMatchSnapshot(msg) {
-        return (0, vitest_1.expect)(await this.value()).toMatchSnapshot(msg ?? this.#message);
+        return expect(await this.value()).toMatchSnapshot(msg ?? this.#message);
     }
 }
-exports.Checker = Checker;
-const check = (value, msg) => {
+export const check = (value, msg) => {
     if (value instanceof Checker) {
         if (msg) {
             return value.message(msg);
@@ -161,19 +157,14 @@ const check = (value, msg) => {
     }
     return new Checker(value, msg);
 };
-exports.check = check;
-const checkEvents = ({ events }, ...filters) => (0, exports.check)(events, 'events')
+export const checkEvents = ({ events }, ...filters) => check(events, 'events')
     .filterEvents(...filters)
     .redact();
-exports.checkEvents = checkEvents;
-const checkSystemEvents = ({ api }, ...filters) => (0, exports.check)(api.query.system.events(), 'system events')
+export const checkSystemEvents = ({ api }, ...filters) => check(api.query.system.events(), 'system events')
     .filterEvents(...filters)
     .redact();
-exports.checkSystemEvents = checkSystemEvents;
-const checkUmp = ({ api }) => (0, exports.check)(api.query.parachainSystem.upwardMessages(), 'ump').map((value) => api.createType('Vec<XcmVersionedXcm>', value).toJSON());
-exports.checkUmp = checkUmp;
-const checkHrmp = ({ api }) => (0, exports.check)(api.query.parachainSystem.hrmpOutboundMessages(), 'hrmp').map((value) => value.map(({ recipient, data }) => ({
+export const checkUmp = ({ api }) => check(api.query.parachainSystem.upwardMessages(), 'ump').map((value) => api.createType('Vec<XcmVersionedXcm>', value).toJSON());
+export const checkHrmp = ({ api }) => check(api.query.parachainSystem.hrmpOutboundMessages(), 'hrmp').map((value) => value.map(({ recipient, data }) => ({
     data: api.createType('(XcmpMessageFormat, XcmVersionedXcm)', data),
     recipient,
 })));
-exports.checkHrmp = checkHrmp;

package/lib/index.js

@@ -1,26 +1,9 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.testingPairs = exports.sendTransaction = exports.defer = exports.redact = exports.matchSystemEvents = exports.matchEvents = exports.expectHex = exports.expectJson = exports.setupNetworks = exports.setupContextWithConfig = exports.setupContext = exports.createConfig = void 0;
-const api_1 = require("@polkadot/api");
-const chopsticks_1 = require("@acala-network/chopsticks");
-const keyring_1 = require("@polkadot/keyring");
-const vitest_1 = require("vitest");
-__exportStar(require("./check"), exports);
-const createConfig = ({ endpoint, blockNumber, blockHash, wasmOverride, db, timeout, port, maxMemoryBlockCount, }) => {
+import { ApiPromise, WsProvider } from '@polkadot/api';
+import { BuildBlockMode, connectParachains, connectVertical, fetchConfig, setupWithServer, } from '@acala-network/chopsticks';
+import { Keyring, createTestKeyring } from '@polkadot/keyring';
+import { expect } from 'vitest';
+export * from './check';
+export const createConfig = ({ endpoint, blockNumber, blockHash, wasmOverride, db, timeout, port, maxMemoryBlockCount, }) => {
     // random port if not specified
     port = port ?? Math.floor(Math.random() * 10000) + 10000;
     const config = {
@@ -28,7 +11,7 @@ const createConfig = ({ endpoint, blockNumber, blockHash, wasmOverride, db, time
         port,
         block: blockNumber || blockHash,
         mockSignatureHost: true,
-        'build-block-mode': chopsticks_1.BuildBlockMode.Manual,
+        'build-block-mode': BuildBlockMode.Manual,
         'max-memory-block-count': maxMemoryBlockCount ?? 100,
         db,
         'wasm-override': wasmOverride,
@@ -36,16 +19,14 @@ const createConfig = ({ endpoint, blockNumber, blockHash, wasmOverride, db, time
     };
     return config;
 };
-exports.createConfig = createConfig;
-const setupContext = async (option) => {
-    return (0, exports.setupContextWithConfig)((0, exports.createConfig)(option));
+export const setupContext = async (option) => {
+    return setupContextWithConfig(createConfig(option));
 };
-exports.setupContext = setupContext;
-const setupContextWithConfig = async ({ timeout, ...config }) => {
-    const { chain, listenPort, close } = await (0, chopsticks_1.setupWithServer)(config);
+export const setupContextWithConfig = async ({ timeout, ...config }) => {
+    const { chain, listenPort, close } = await setupWithServer(config);
     const url = `ws://localhost:${listenPort}`;
-    const ws = new api_1.WsProvider(url, undefined, undefined, timeout);
-    const api = await api_1.ApiPromise.create({
+    const ws = new WsProvider(url, undefined, undefined, timeout);
+    const api = await ApiPromise.create({
         provider: ws,
         signedExtensions: {
             SetEvmOrigin: {
@@ -79,32 +60,31 @@ const setupContextWithConfig = async ({ timeout, ...config }) => {
             await close();
         },
         async pause() {
-            await ws.send('dev_setBlockBuildMode', [chopsticks_1.BuildBlockMode.Instant]);
+            await ws.send('dev_setBlockBuildMode', [BuildBlockMode.Instant]);
             // log a bit later to ensure the message is visible
             setTimeout(() => console.log(`Test paused. Polkadot.js apps URL: https://polkadot.js.org/apps/?rpc=${url}`), 100);
             return new Promise((_resolve) => { }); // wait forever
         },
     };
 };
-exports.setupContextWithConfig = setupContextWithConfig;
-const setupNetworks = async (networkOptions) => {
+export const setupNetworks = async (networkOptions) => {
     const ret = {};
     let wasmOverriden = false;
     for (const [name, options] of Object.entries(networkOptions)) {
-        const config = typeof options === 'string' ? await (0, chopsticks_1.fetchConfig)(options) : options ?? (await (0, chopsticks_1.fetchConfig)(name));
-        ret[name] = await (0, exports.setupContextWithConfig)(config);
+        const config = typeof options === 'string' ? await fetchConfig(options) : options ?? (await fetchConfig(name));
+        ret[name] = await setupContextWithConfig(config);
         wasmOverriden ||= config['wasm-override'] != null;
     }
     const relaychainName = Object.keys(ret).filter((x) => ['polkadot', 'kusama'].includes(x.toLocaleLowerCase()))[0];
     const { [relaychainName]: relaychain, ...parachains } = ret;
     if (relaychain) {
         for (const parachain of Object.values(parachains)) {
-            await (0, chopsticks_1.connectVertical)(relaychain.chain, parachain.chain);
+            await connectVertical(relaychain.chain, parachain.chain);
         }
     }
     const parachainList = Object.values(parachains).map((i) => i.chain);
     if (parachainList.length > 0) {
-        await (0, chopsticks_1.connectParachains)(parachainList);
+        await connectParachains(parachainList);
     }
     if (wasmOverriden) {
         // trigger runtime upgrade if needed (due to wasm override)
@@ -118,19 +98,16 @@ const setupNetworks = async (networkOptions) => {
     }
     return ret;
 };
-exports.setupNetworks = setupNetworks;
 const processCodecOrArray = (codec, fn) => Array.isArray(codec) ? codec.map(fn) : fn(codec);
 const toHuman = (codec) => processCodecOrArray(codec, (c) => c?.toHuman?.() ?? c);
 const toJson = (codec) => processCodecOrArray(codec, (c) => c?.toJSON?.() ?? c);
 const toHex = (codec) => processCodecOrArray(codec, (c) => c?.toHex?.() ?? c);
-const expectJson = (codec) => {
-    return (0, vitest_1.expect)(toJson(codec));
+export const expectJson = (codec) => {
+    return expect(toJson(codec));
 };
-exports.expectJson = expectJson;
-const expectHex = (codec) => {
-    return (0, vitest_1.expect)(toHex(codec));
+export const expectHex = (codec) => {
+    return expect(toHex(codec));
 };
-exports.expectHex = expectHex;
 const _matchEvents = async (msg, events, ...filters) => {
     let data = toHuman(await events).map(({ event: { index: _, ...event } }) => event);
     if (filters.length > 0) {
@@ -145,17 +122,15 @@ const _matchEvents = async (msg, events, ...filters) => {
             });
         });
     }
-    return (0, vitest_1.expect)(data).toMatchSnapshot(msg);
+    return expect(data).toMatchSnapshot(msg);
 };
-const matchEvents = async (events, ...filters) => {
-    return _matchEvents('events', (0, exports.redact)(events), ...filters);
+export const matchEvents = async (events, ...filters) => {
+    return _matchEvents('events', redact(events), ...filters);
 };
-exports.matchEvents = matchEvents;
-const matchSystemEvents = async ({ api }, ...filters) => {
-    await _matchEvents('system events', (0, exports.redact)(api.query.system.events()), ...filters);
+export const matchSystemEvents = async ({ api }, ...filters) => {
+    await _matchEvents('system events', redact(api.query.system.events()), ...filters);
 };
-exports.matchSystemEvents = matchSystemEvents;
-const redact = async (data) => {
+export const redact = async (data) => {
     const json = toHuman(await data);
     const process = (obj) => {
         if (obj == null) {
@@ -192,8 +167,7 @@ const redact = async (data) => {
     };
     return process(json);
 };
-exports.redact = redact;
-function defer() {
+export function defer() {
     const deferred = {};
     deferred.promise = new Promise((resolve, reject) => {
         deferred.resolve = resolve;
@@ -201,8 +175,7 @@ function defer() {
     });
     return deferred;
 }
-exports.defer = defer;
-const sendTransaction = async (tx) => {
+export const sendTransaction = async (tx) => {
     const signed = await tx;
     const deferred = defer();
     await signed.send((status) => {
@@ -218,11 +191,10 @@ const sendTransaction = async (tx) => {
         events: deferred.promise,
     };
 };
-exports.sendTransaction = sendTransaction;
-const testingPairs = (keyringType = 'ed25519', ss58Format) => {
-    const keyringEth = (0, keyring_1.createTestKeyring)({ type: 'ethereum' });
+export const testingPairs = (keyringType = 'ed25519', ss58Format) => {
+    const keyringEth = createTestKeyring({ type: 'ethereum' });
     // default to ed25519 because sr25519 signature is non-deterministic
-    const keyring = new keyring_1.Keyring({ type: keyringType, ss58Format });
+    const keyring = new Keyring({ type: keyringType, ss58Format });
     return {
         alice: keyring.addFromUri('//Alice'),
         bob: keyring.addFromUri('//Bob'),
@@ -238,4 +210,3 @@ const testingPairs = (keyringType = 'ed25519', ss58Format) => {
         keyringEth,
     };
 };
-exports.testingPairs = testingPairs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-testing",
-  "version": "0.8.0-4",
+  "version": "0.8.0-6",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
   "license": "Apache-2.0",
   "scripts": {
@@ -8,10 +8,10 @@
     "build": "tsc -p ./tsconfig.json"
   },
   "dependencies": {
-    "@acala-network/chopsticks": "0.8.0-4"
+    "@acala-network/chopsticks": "0.8.0-6"
   },
   "peerDependencies": {
-    "vitest": "^0.33.0"
+    "vitest": "^0.34.0"
   },
   "devDependencies": {
     "@types/chai": "^4.3.5",