From 53315d9c4bfdb4b8553f13f00b244904ac810884 Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Sat, 11 Nov 2023 19:33:02 +0700 Subject: [PATCH] chore: try insecure firefox --- .github/actions/docker/action.yaml | 8 ++++++-- .github/workflows/release-docker-image.yml | 1 + .github/workflows/tests-build-image.yml | 3 ++- .github/workflows/tests-build-js.yml | 2 +- .github/workflows/tests-test-suite.yml | 4 ++-- .pnp.cjs | 16 ++-------------- ...launcher-npm-2.3.1-9faca73d35-8fd4a8e6e0.zip | Bin 21343 -> 0 bytes packages/js-dapi-client/karma.conf.js | 4 +--- packages/js-dapi-client/package.json | 1 - packages/js-dash-sdk/karma/options.js | 16 +++++++++++----- packages/js-dash-sdk/package.json | 2 +- packages/platform-test-suite/karma.conf.js | 16 +++++++++++----- packages/platform-test-suite/package.json | 1 - packages/wallet-lib/karma/options.js | 16 +++++++++++----- packages/wallet-lib/package.json | 2 +- packages/wasm-dpp/karma.conf.js | 4 +--- packages/wasm-dpp/package.json | 1 - yarn.lock | 16 +++------------- 18 files changed, 54 insertions(+), 59 deletions(-) delete mode 100644 .yarn/cache/@chiragrupani-karma-chromium-edge-launcher-npm-2.3.1-9faca73d35-8fd4a8e6e0.zip diff --git a/.github/actions/docker/action.yaml b/.github/actions/docker/action.yaml index 376caa86e45..97938e34d4b 100644 --- a/.github/actions/docker/action.yaml +++ b/.github/actions/docker/action.yaml @@ -15,6 +15,9 @@ inputs: default: "false" target: description: "Target stage within Dockerfile: dapi, drive-abci, dashmate-helper, test-suite" + platform: + description: Platform to build for. i.e linux/amd64 or linux/arm64 + required: true dockerhub_username: description: User name to use when pushing images to Docker Hub dockerhub_token: @@ -89,9 +92,9 @@ runs: with: script: | if ('${{ inputs.push_tags}}' != 'true') { - core.setOutput('tags', ''); + core.setOutput('tags', ''); } else { - core.setOutput('tags', '${{ steps.docker_meta.outputs.tags }}'); + core.setOutput('tags', '${{ steps.docker_meta.outputs.tags }}'); } - name: Build and push Docker image ${{ inputs.image }} @@ -103,6 +106,7 @@ runs: target: ${{ inputs.target }} labels: ${{ steps.docker_meta.outputs.labels }} tags: ${{ steps.tags.outputs.tags }} + platforms: ${{ inputs.platform }} build-args: | CARGO_BUILD_PROFILE=${{ inputs.cargo_profile }} RUSTC_WRAPPER=sccache diff --git a/.github/workflows/release-docker-image.yml b/.github/workflows/release-docker-image.yml index 2088c57306d..7adbdf10b03 100644 --- a/.github/workflows/release-docker-image.yml +++ b/.github/workflows/release-docker-image.yml @@ -64,6 +64,7 @@ jobs: image_org: ${{ inputs.image_org }} image_version: ${{ steps.version.outputs.result }} target: ${{ inputs.target }} + platform: ${{ matrix.platform }} cargo_profile: release dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }} dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/tests-build-image.yml b/.github/workflows/tests-build-image.yml index ee2862f5142..3c342527ddd 100644 --- a/.github/workflows/tests-build-image.yml +++ b/.github/workflows/tests-build-image.yml @@ -17,7 +17,7 @@ on: jobs: build-image: name: Build ${{ inputs.name }} image - runs-on: [ "self-hosted", "linux", "arm64-4x", "ubuntu-platform" ] + runs-on: [ "self-hosted", "linux", "arm64", "ubuntu-platform" ] steps: - name: Check out repo uses: actions/checkout@v4 @@ -39,6 +39,7 @@ jobs: image_name: ${{ inputs.image_name }} image_org: ${{ vars.AWS_ACCOUNT_ID }}.dkr.ecr.${{ vars.AWS_REGION }}.amazonaws.com target: ${{ inputs.target }} + platform: linux/arm64 push_tags: true dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }} dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/tests-build-js.yml b/.github/workflows/tests-build-js.yml index ddb2a0df329..9c8b767b11e 100644 --- a/.github/workflows/tests-build-js.yml +++ b/.github/workflows/tests-build-js.yml @@ -4,7 +4,7 @@ on: jobs: build-js: name: Build JS - runs-on: [ "self-hosted", "linux", "arm64-4x", "ubuntu-platform" ] + runs-on: [ "self-hosted", "linux", "arm64", "ubuntu-platform" ] steps: - name: Configure AWS credentials and bucket region uses: aws-actions/configure-aws-credentials@v4 diff --git a/.github/workflows/tests-test-suite.yml b/.github/workflows/tests-test-suite.yml index f24f6953654..7208e6ee169 100644 --- a/.github/workflows/tests-test-suite.yml +++ b/.github/workflows/tests-test-suite.yml @@ -18,8 +18,8 @@ jobs: runs-on: [ "self-hosted", "linux", "arm64", "ubuntu-platform" ] timeout-minutes: 15 env: - CHROMIUM_BASED_BROWSER_NAME: EdgeHeadless - EDGE_BIN: /usr/bin/microsoft-edge + BROWSER_TESTS_INSECURE_BROWSER: FirefoxHeadlessInsecure + BROWSER_TESTS_CHROMIUM_BROWSER: ChromiumHeadless steps: - name: Check out repo uses: actions/checkout@v4 diff --git a/.pnp.cjs b/.pnp.cjs index 98ebcb96020..6943eb814bc 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -2274,15 +2274,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["@chiragrupani/karma-chromium-edge-launcher", [\ - ["npm:2.3.1", {\ - "packageLocation": "./.yarn/cache/@chiragrupani-karma-chromium-edge-launcher-npm-2.3.1-9faca73d35-8fd4a8e6e0.zip/node_modules/@chiragrupani/karma-chromium-edge-launcher/",\ - "packageDependencies": [\ - ["@chiragrupani/karma-chromium-edge-launcher", "npm:2.3.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["@colors/colors", [\ ["npm:1.5.0", {\ "packageLocation": "./.yarn/cache/@colors-colors-npm-1.5.0-875af3a8b4-d64d5260be.zip/node_modules/@colors/colors/",\ @@ -2405,7 +2396,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [\ ["@dashevo/dapi-client", "workspace:packages/js-dapi-client"],\ ["@babel/core", "npm:7.16.0"],\ - ["@chiragrupani/karma-chromium-edge-launcher", "npm:2.3.1"],\ ["@dashevo/dapi-grpc", "workspace:packages/dapi-grpc"],\ ["@dashevo/dash-spv", "workspace:packages/dash-spv"],\ ["@dashevo/dashcore-lib", "npm:0.21.0"],\ @@ -2738,7 +2728,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./packages/platform-test-suite/",\ "packageDependencies": [\ ["@dashevo/platform-test-suite", "workspace:packages/platform-test-suite"],\ - ["@chiragrupani/karma-chromium-edge-launcher", "npm:2.3.1"],\ ["@dashevo/dapi-client", "workspace:packages/js-dapi-client"],\ ["@dashevo/dashcore-lib", "npm:0.21.0"],\ ["@dashevo/dpns-contract", "workspace:packages/dpns-contract"],\ @@ -2831,7 +2820,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./packages/wallet-lib/",\ "packageDependencies": [\ ["@dashevo/wallet-lib", "workspace:packages/wallet-lib"],\ - ["@chiragrupani/karma-chromium-edge-launcher", "npm:2.3.1"],\ ["@dashevo/dapi-client", "workspace:packages/js-dapi-client"],\ ["@dashevo/dash-spv", "workspace:packages/dash-spv"],\ ["@dashevo/dashcore-lib", "npm:0.21.0"],\ @@ -2856,6 +2844,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["karma", "npm:6.4.1"],\ ["karma-chai", "virtual:e2d057e7cc143d3cb9bec864f4a2d862441b5a09f81f8e6c46e7a098cbc89e4d07017cc6e2e2142d5704bb55da853cbec2d025ebc0b30e8696c31380c00f2c7d#npm:0.1.0"],\ ["karma-chrome-launcher", "npm:3.1.0"],\ + ["karma-firefox-launcher", "npm:2.1.2"],\ ["karma-mocha", "npm:2.0.1"],\ ["karma-mocha-reporter", "virtual:e2d057e7cc143d3cb9bec864f4a2d862441b5a09f81f8e6c46e7a098cbc89e4d07017cc6e2e2142d5704bb55da853cbec2d025ebc0b30e8696c31380c00f2c7d#npm:2.2.5"],\ ["karma-sourcemap-loader", "npm:0.3.8"],\ @@ -2894,7 +2883,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@babel/cli", "virtual:e2d057e7cc143d3cb9bec864f4a2d862441b5a09f81f8e6c46e7a098cbc89e4d07017cc6e2e2142d5704bb55da853cbec2d025ebc0b30e8696c31380c00f2c7d#npm:7.21.0"],\ ["@babel/core", "npm:7.16.0"],\ ["@babel/preset-env", "virtual:e2d057e7cc143d3cb9bec864f4a2d862441b5a09f81f8e6c46e7a098cbc89e4d07017cc6e2e2142d5704bb55da853cbec2d025ebc0b30e8696c31380c00f2c7d#npm:7.16.4"],\ - ["@chiragrupani/karma-chromium-edge-launcher", "npm:2.3.1"],\ ["@dashevo/bls", "npm:1.2.9"],\ ["@dashevo/dashcore-lib", "npm:0.21.0"],\ ["@dashevo/dpns-contract", "workspace:packages/dpns-contract"],\ @@ -8000,7 +7988,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./packages/js-dash-sdk/",\ "packageDependencies": [\ ["dash", "workspace:packages/js-dash-sdk"],\ - ["@chiragrupani/karma-chromium-edge-launcher", "npm:2.3.1"],\ ["@dashevo/bls", "npm:1.2.9"],\ ["@dashevo/dapi-client", "workspace:packages/js-dapi-client"],\ ["@dashevo/dapi-grpc", "workspace:packages/dapi-grpc"],\ @@ -8040,6 +8027,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["karma", "npm:6.4.1"],\ ["karma-chai", "virtual:ad53cff31b1dbd4927a99e71702e3b8b10338636eaff010987c27c9ccea2d52af36900a9e36a4231cbb6e5464248ccc9c1da5d1d24d9b0f4f95660296b1060a6#npm:0.1.0"],\ ["karma-chrome-launcher", "npm:3.1.0"],\ + ["karma-firefox-launcher", "npm:2.1.2"],\ ["karma-mocha", "npm:2.0.1"],\ ["karma-mocha-reporter", "virtual:e2d057e7cc143d3cb9bec864f4a2d862441b5a09f81f8e6c46e7a098cbc89e4d07017cc6e2e2142d5704bb55da853cbec2d025ebc0b30e8696c31380c00f2c7d#npm:2.2.5"],\ ["karma-webpack", "virtual:ad53cff31b1dbd4927a99e71702e3b8b10338636eaff010987c27c9ccea2d52af36900a9e36a4231cbb6e5464248ccc9c1da5d1d24d9b0f4f95660296b1060a6#npm:5.0.0"],\ diff --git a/.yarn/cache/@chiragrupani-karma-chromium-edge-launcher-npm-2.3.1-9faca73d35-8fd4a8e6e0.zip b/.yarn/cache/@chiragrupani-karma-chromium-edge-launcher-npm-2.3.1-9faca73d35-8fd4a8e6e0.zip deleted file mode 100644 index eb8acff7f674df039def36598cff4d77b70f911f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21343 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°H#?Fj?3nC~Hx}+4yShxPoqbTF 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 diff --git a/packages/js-dapi-client/karma.conf.js b/packages/js-dapi-client/karma.conf.js index 155203cd6ab..62d0d5141ca 100644 --- a/packages/js-dapi-client/karma.conf.js +++ b/packages/js-dapi-client/karma.conf.js @@ -3,7 +3,6 @@ const karmaMochaReporter = require('karma-mocha-reporter'); const karmaChai = require('karma-chai'); const karmaChromeLauncher = require('karma-chrome-launcher'); const karmaFirefoxLauncher = require('karma-firefox-launcher'); -const karmaChromiumEdgeLauncher = require('@chiragrupani/karma-chromium-edge-launcher'); const karmaWebpack = require('karma-webpack'); const webpackConfig = require('./webpack.config'); @@ -31,7 +30,7 @@ module.exports = (config) => { colors: true, logLevel: config.LOG_INFO, autoWatch: false, - browsers: [process.env.CHROMIUM_BASED_BROWSER_NAME || 'ChromeHeadless', 'FirefoxHeadless'], + browsers: [process.env.BROWSER_TESTS_CHROMIUM_BROWSER || 'ChromeHeadless', 'FirefoxHeadless'], singleRun: false, concurrency: Infinity, plugins: [ @@ -40,7 +39,6 @@ module.exports = (config) => { karmaChai, karmaChromeLauncher, karmaFirefoxLauncher, - karmaChromiumEdgeLauncher, karmaWebpack, ], }); diff --git a/packages/js-dapi-client/package.json b/packages/js-dapi-client/package.json index d7402f1bc45..cd898ffde33 100644 --- a/packages/js-dapi-client/package.json +++ b/packages/js-dapi-client/package.json @@ -42,7 +42,6 @@ }, "devDependencies": { "@babel/core": "^7.15.5", - "@chiragrupani/karma-chromium-edge-launcher": "^2.3.1", "assert-browserify": "^2.0.0", "babel-loader": "^8.2.2", "browserify-zlib": "^0.2.0", diff --git a/packages/js-dash-sdk/karma/options.js b/packages/js-dash-sdk/karma/options.js index afc8e0fda7c..3d12aede319 100644 --- a/packages/js-dash-sdk/karma/options.js +++ b/packages/js-dash-sdk/karma/options.js @@ -6,7 +6,7 @@ const karmaMocha = require('karma-mocha'); const karmaMochaReporter = require('karma-mocha-reporter'); const karmaChai = require('karma-chai'); const karmaChromeLauncher = require('karma-chrome-launcher'); -const karmaChromiumEdgeLauncher = require('@chiragrupani/karma-chromium-edge-launcher'); +const karmaFirefoxLauncher = require('karma-firefox-launcher'); const karmaWebpack = require('karma-webpack'); const webpackBaseConfig = require('../webpack.base.config'); @@ -35,7 +35,7 @@ module.exports = { port: 9876, colors: true, autoWatch: false, - browsers: ['chromeWithoutSecurity'], + browsers: [process.env.BROWSER_TESTS_INSECURE_BROWSER || 'ChromeHeadlessInsecure'], singleRun: false, concurrency: Infinity, browserNoActivityTimeout: 7 * 60 * 1000, // 30000 default @@ -46,14 +46,20 @@ module.exports = { karmaMochaReporter, karmaChai, karmaChromeLauncher, - karmaChromiumEdgeLauncher, + karmaFirefoxLauncher, karmaWebpack, ], customLaunchers: { - chromeWithoutSecurity: { - base: process.env.CHROMIUM_BASED_BROWSER_NAME || 'ChromeHeadless', + ChromeHeadlessInsecure: { + base: process.env.BROWSER_TESTS_CHROMIUM_BROWSER || 'ChromeHeadless', flags: ['--allow-insecure-localhost'], displayName: 'Chrome w/o security', }, + FirefoxHeadlessInsecure: { + base: 'FirefoxHeadless', + prefs: { + acceptInsecureCerts: true, + }, + }, }, }; diff --git a/packages/js-dash-sdk/package.json b/packages/js-dash-sdk/package.json index e6a54f804c8..905d4b0852d 100644 --- a/packages/js-dash-sdk/package.json +++ b/packages/js-dash-sdk/package.json @@ -53,7 +53,6 @@ "winston": "^3.2.1" }, "devDependencies": { - "@chiragrupani/karma-chromium-edge-launcher": "^2.3.1", "@types/chai": "^4.2.12", "@types/dirty-chai": "^2.0.2", "@types/expect": "^24.3.0", @@ -82,6 +81,7 @@ "karma": "^6.4.1", "karma-chai": "^0.1.0", "karma-chrome-launcher": "^3.1.0", + "karma-firefox-launcher": "^2.1.2", "karma-mocha": "^2.0.1", "karma-mocha-reporter": "^2.2.5", "karma-webpack": "^5.0.0", diff --git a/packages/platform-test-suite/karma.conf.js b/packages/platform-test-suite/karma.conf.js index 6dd62720384..41d5ca30ffb 100644 --- a/packages/platform-test-suite/karma.conf.js +++ b/packages/platform-test-suite/karma.conf.js @@ -5,7 +5,7 @@ const karmaMocha = require('karma-mocha'); const karmaMochaReporter = require('karma-mocha-reporter'); const karmaChai = require('karma-chai'); const karmaChromeLauncher = require('karma-chrome-launcher'); -const karmaChromiumEdgeLauncher = require('@chiragrupani/karma-chromium-edge-launcher'); +const karmaFirefoxLauncher = require('karma-firefox-launcher'); const karmaSourcemapLoader = require('karma-sourcemap-loader'); const karmaWebpack = require('karma-webpack'); @@ -68,7 +68,7 @@ module.exports = (config) => { port: 9876, colors: true, logLevel: config.LOG_INFO, - browsers: ['chromeWithoutSecurity'], + browsers: [process.env.BROWSER_TESTS_INSECURE_BROWSER || 'ChromeHeadlessInsecure'], singleRun: true, concurrency: Infinity, plugins: [ @@ -76,16 +76,22 @@ module.exports = (config) => { karmaMochaReporter, karmaChai, karmaChromeLauncher, - karmaChromiumEdgeLauncher, + karmaFirefoxLauncher, karmaSourcemapLoader, karmaWebpack, ], customLaunchers: { - chromeWithoutSecurity: { - base: process.env.CHROMIUM_BASED_BROWSER_NAME || 'ChromeHeadless', + ChromeHeadlessInsecure: { + base: process.env.BROWSER_TESTS_CHROMIUM_BROWSER || 'ChromeHeadless', flags: ['--allow-insecure-localhost'], displayName: 'Chrome w/o security', }, + FirefoxHeadlessInsecure: { + base: 'FirefoxHeadless', + prefs: { + acceptInsecureCerts: true, + }, + }, }, }); }; diff --git a/packages/platform-test-suite/package.json b/packages/platform-test-suite/package.json index c43b9520939..7610c349dd0 100644 --- a/packages/platform-test-suite/package.json +++ b/packages/platform-test-suite/package.json @@ -23,7 +23,6 @@ }, "homepage": "https://github.com/dashevo/platform-test-suite#readme", "dependencies": { - "@chiragrupani/karma-chromium-edge-launcher": "^2.3.1", "@dashevo/dapi-client": "workspace:*", "@dashevo/dashcore-lib": "~0.21.0", "@dashevo/dpns-contract": "workspace:*", diff --git a/packages/wallet-lib/karma/options.js b/packages/wallet-lib/karma/options.js index 691ec37b52e..5b62f6ac2a3 100644 --- a/packages/wallet-lib/karma/options.js +++ b/packages/wallet-lib/karma/options.js @@ -6,7 +6,7 @@ const karmaMocha = require('karma-mocha'); const karmaMochaReporter = require('karma-mocha-reporter'); const karmaChai = require('karma-chai'); const karmaChromeLauncher = require('karma-chrome-launcher'); -const karmaChromiumEdgeLauncher = require('@chiragrupani/karma-chromium-edge-launcher'); +const karmaFirefoxLauncher = require('karma-firefox-launcher'); const karmaSourcemapLoader = require('karma-sourcemap-loader'); const karmaWebpack = require('karma-webpack'); @@ -43,7 +43,7 @@ module.exports = { port: 9876, colors: true, autoWatch: false, - browsers: ['chromeWithoutSecurity'], + browsers: [process.env.BROWSER_TESTS_INSECURE_BROWSER || 'chromeWithoutSecurity'], singleRun: false, concurrency: Infinity, browserNoActivityTimeout: 10 * 60 * 1000, @@ -52,15 +52,21 @@ module.exports = { karmaMochaReporter, karmaChai, karmaChromeLauncher, - karmaChromiumEdgeLauncher, + karmaFirefoxLauncher, karmaSourcemapLoader, karmaWebpack, ], customLaunchers: { - chromeWithoutSecurity: { - base: process.env.CHROMIUM_BASED_BROWSER_NAME || 'ChromeHeadless', + ChromeHeadlessInsecure: { + base: process.env.BROWSER_TESTS_CHROMIUM_BROWSER || 'ChromeHeadless', flags: ['--allow-insecure-localhost'], displayName: 'Chrome w/o security', }, + FirefoxHeadlessInsecure: { + base: 'FirefoxHeadless', + prefs: { + acceptInsecureCerts: true, + }, + }, }, }; diff --git a/packages/wallet-lib/package.json b/packages/wallet-lib/package.json index 610599f2e0b..102a933aacc 100644 --- a/packages/wallet-lib/package.json +++ b/packages/wallet-lib/package.json @@ -58,7 +58,6 @@ "winston": "^3.2.1" }, "devDependencies": { - "@chiragrupani/karma-chromium-edge-launcher": "^2.3.1", "@dashevo/dash-spv": "workspace:*", "assert": "^2.0.0", "browserify-zlib": "^0.2.0", @@ -76,6 +75,7 @@ "karma": "^6.4.1", "karma-chai": "^0.1.0", "karma-chrome-launcher": "^3.1.0", + "karma-firefox-launcher": "^2.1.2", "karma-mocha": "^2.0.1", "karma-mocha-reporter": "^2.2.5", "karma-sourcemap-loader": "^0.3.7", diff --git a/packages/wasm-dpp/karma.conf.js b/packages/wasm-dpp/karma.conf.js index 32bf2959806..1e13951ab89 100644 --- a/packages/wasm-dpp/karma.conf.js +++ b/packages/wasm-dpp/karma.conf.js @@ -3,7 +3,6 @@ const karmaMocha = require('karma-mocha'); const karmaMochaReporter = require('karma-mocha-reporter'); const karmaChai = require('karma-chai'); const karmaChromeLauncher = require('karma-chrome-launcher'); -const karmaChromiumEdgeLauncher = require('@chiragrupani/karma-chromium-edge-launcher'); const karmaFirefoxLauncher = require('karma-firefox-launcher'); const karmaWebpack = require('karma-webpack'); @@ -61,7 +60,7 @@ module.exports = (config) => { logLevel: config.LOG_INFO, autoWatch: false, browsers: [ - process.env.CHROMIUM_BASED_BROWSER_NAME || 'ChromeHeadless', + process.env.BROWSER_TESTS_CHROMIUM_BROWSER || 'ChromeHeadless', 'FirefoxHeadless', ], singleRun: false, @@ -72,7 +71,6 @@ module.exports = (config) => { karmaChai, karmaChromeLauncher, karmaFirefoxLauncher, - karmaChromiumEdgeLauncher, karmaWebpack, ], }); diff --git a/packages/wasm-dpp/package.json b/packages/wasm-dpp/package.json index 3bc7ca66dd9..06b3a1b4434 100644 --- a/packages/wasm-dpp/package.json +++ b/packages/wasm-dpp/package.json @@ -43,7 +43,6 @@ "@babel/cli": "^7.21.0", "@babel/core": "^7.15.5", "@babel/preset-env": "^7.15.4", - "@chiragrupani/karma-chromium-edge-launcher": "^2.3.1", "@dashevo/dashcore-lib": "~0.21.0", "@dashevo/dpns-contract": "workspace:*", "@types/bs58": "^4.0.1", diff --git a/yarn.lock b/yarn.lock index 19181ecdd35..7337dbdab1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1290,13 +1290,6 @@ __metadata: languageName: node linkType: hard -"@chiragrupani/karma-chromium-edge-launcher@npm:^2.3.1": - version: 2.3.1 - resolution: "@chiragrupani/karma-chromium-edge-launcher@npm:2.3.1" - checksum: 8fd4a8e6e06f8188fa91ca3a07b51c9a325045a47cc5e483fd718aa890692148ee7e8b528f9f1c50151074c80f4cb81808ddb4dc5ca02c665dea6c932eb15325 - languageName: node - linkType: hard - "@colors/colors@npm:1.5.0": version: 1.5.0 resolution: "@colors/colors@npm:1.5.0" @@ -1366,7 +1359,6 @@ __metadata: resolution: "@dashevo/dapi-client@workspace:packages/js-dapi-client" dependencies: "@babel/core": ^7.15.5 - "@chiragrupani/karma-chromium-edge-launcher": ^2.3.1 "@dashevo/dapi-grpc": "workspace:*" "@dashevo/dash-spv": "workspace:*" "@dashevo/dashcore-lib": ~0.21.0 @@ -1703,7 +1695,6 @@ __metadata: version: 0.0.0-use.local resolution: "@dashevo/platform-test-suite@workspace:packages/platform-test-suite" dependencies: - "@chiragrupani/karma-chromium-edge-launcher": ^2.3.1 "@dashevo/dapi-client": "workspace:*" "@dashevo/dashcore-lib": ~0.21.0 "@dashevo/dpns-contract": "workspace:*" @@ -1804,7 +1795,6 @@ __metadata: version: 0.0.0-use.local resolution: "@dashevo/wallet-lib@workspace:packages/wallet-lib" dependencies: - "@chiragrupani/karma-chromium-edge-launcher": ^2.3.1 "@dashevo/dapi-client": "workspace:*" "@dashevo/dash-spv": "workspace:*" "@dashevo/dashcore-lib": ~0.21.0 @@ -1829,6 +1819,7 @@ __metadata: karma: ^6.4.1 karma-chai: ^0.1.0 karma-chrome-launcher: ^3.1.0 + karma-firefox-launcher: ^2.1.2 karma-mocha: ^2.0.1 karma-mocha-reporter: ^2.2.5 karma-sourcemap-loader: ^0.3.7 @@ -1865,7 +1856,6 @@ __metadata: "@babel/cli": ^7.21.0 "@babel/core": ^7.15.5 "@babel/preset-env": ^7.15.4 - "@chiragrupani/karma-chromium-edge-launcher": ^2.3.1 "@dashevo/bls": ~1.2.9 "@dashevo/dashcore-lib": ~0.21.0 "@dashevo/dpns-contract": "workspace:*" @@ -6009,7 +5999,6 @@ __metadata: version: 0.0.0-use.local resolution: "dash@workspace:packages/js-dash-sdk" dependencies: - "@chiragrupani/karma-chromium-edge-launcher": ^2.3.1 "@dashevo/bls": ~1.2.9 "@dashevo/dapi-client": "workspace:*" "@dashevo/dapi-grpc": "workspace:*" @@ -6049,6 +6038,7 @@ __metadata: karma: ^6.4.1 karma-chai: ^0.1.0 karma-chrome-launcher: ^3.1.0 + karma-firefox-launcher: ^2.1.2 karma-mocha: ^2.0.1 karma-mocha-reporter: ^2.2.5 karma-webpack: ^5.0.0 @@ -9680,7 +9670,7 @@ fsevents@~2.3.2: languageName: node linkType: hard -"karma-firefox-launcher@npm:^2.1.1": +"karma-firefox-launcher@npm:^2.1.1, karma-firefox-launcher@npm:^2.1.2": version: 2.1.2 resolution: "karma-firefox-launcher@npm:2.1.2" dependencies: