Merge branch 'develop' into chore/move-keyring-snap-files

MetaMask · Jun 24, 2024 · 7df81da · 7df81da
2 parents 263c494 + 18ebe12
commit 7df81da
Show file tree

Hide file tree

Showing 15 changed files with 186 additions and 259 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,6 +13,12 @@ executors:
     resource_class: medium
     environment:
       NODE_OPTIONS: --max_old_space_size=3072
+  node-linux-medium:
+    machine:
+      image: ubuntu-2404:2024.05.1
+    resource_class: medium #// linux medium: 2 CPUs, 7.5 GB RAM, 10 credits/min
+    environment:
+      NODE_OPTIONS: --max_old_space_size=6144
   node-browsers-medium-plus:
     docker:
       - image: cimg/node:20.11-browsers
@@ -209,9 +215,6 @@ workflows:
                 - /^Version-v(\d+)[.](\d+)[.](\d+)/
           requires:
             - prep-build
-      - test-unit-mocha:
-          requires:
-            - prep-deps
       - test-unit-jest-main:
           requires:
             - prep-deps
@@ -222,7 +225,6 @@ workflows:
           requires:
             - test-unit-jest-main
             - test-unit-jest-development
-            - test-unit-mocha
       - test-unit-global:
           requires:
             - prep-deps
@@ -269,7 +271,6 @@ workflows:
             - test-unit-jest-main
             - test-unit-jest-development
             - test-unit-global
-            - test-unit-mocha
             - upload-and-validate-coverage
             - validate-source-maps
             - validate-source-maps-beta
@@ -502,10 +503,10 @@ jobs:
           command: .circleci/scripts/check-working-tree.sh
 
   prep-build:
-    executor: node-browsers-medium-plus
+    executor: node-linux-medium
     steps:
       - run: *shallow-git-clone
-      - run: sudo corepack enable
+      - run: corepack enable
       - attach_workspace:
           at: .
       - when:
@@ -539,10 +540,10 @@ jobs:
             - builds
 
   prep-build-mv2:
-    executor: node-browsers-medium-plus
+    executor: node-linux-medium
     steps:
       - run: *shallow-git-clone
-      - run: sudo corepack enable
+      - run: corepack enable
       - attach_workspace:
           at: .
       - when:
@@ -582,10 +583,10 @@ jobs:
             - builds-mv2
 
   prep-build-mmi:
-    executor: node-browsers-medium-plus
+    executor: node-linux-medium
     steps:
       - run: *shallow-git-clone
-      - run: sudo corepack enable
+      - run: corepack enable
       - attach_workspace:
           at: .
       - when:
@@ -626,10 +627,10 @@ jobs:
           destination: builds-mmi
 
   prep-build-flask:
-    executor: node-browsers-medium-plus
+    executor: node-linux-medium
     steps:
       - run: *shallow-git-clone
-      - run: sudo corepack enable
+      - run: corepack enable
       - attach_workspace:
           at: .
       - when:
@@ -667,10 +668,10 @@ jobs:
             - builds-flask
 
   prep-build-flask-mv2:
-    executor: node-browsers-medium-plus
+    executor: node-linux-medium
     steps:
       - run: *shallow-git-clone
-      - run: sudo corepack enable
+      - run: corepack enable
       - attach_workspace:
           at: .
       - when:
@@ -708,10 +709,10 @@ jobs:
             - builds-flask-mv2
 
   prep-build-test-flask:
-    executor: node-browsers-medium-plus
+    executor: node-linux-medium
     steps:
       - run: *shallow-git-clone
-      - run: sudo corepack enable
+      - run: corepack enable
       - attach_workspace:
           at: .
       - run:
@@ -730,10 +731,10 @@ jobs:
             - builds-test-flask
 
   prep-build-test-flask-mv2:
-    executor: node-browsers-medium-plus
+    executor: node-linux-medium
     steps:
       - run: *shallow-git-clone
-      - run: sudo corepack enable
+      - run: corepack enable
       - attach_workspace:
           at: .
       - run:
@@ -752,10 +753,10 @@ jobs:
             - builds-test-flask-mv2
 
   prep-build-test-mmi:
-    executor: node-browsers-medium-plus
+    executor: node-linux-medium
     steps:
       - run: *shallow-git-clone
-      - run: sudo corepack enable
+      - run: corepack enable
       - attach_workspace:
           at: .
       - run:
@@ -774,10 +775,10 @@ jobs:
             - builds-test-mmi
 
   prep-build-test-mmi-playwright:
-    executor: node-browsers-medium-plus
+    executor: node-linux-medium
     steps:
       - run: *shallow-git-clone
-      - run: sudo corepack enable
+      - run: corepack enable
       - attach_workspace:
           at: .
       - run: *check-mmi-optional
@@ -803,10 +804,10 @@ jobs:
           destination: builds-test-mmi-playwright
 
   prep-build-test:
-    executor: node-browsers-medium-plus
+    executor: node-linux-medium
     steps:
       - run: *shallow-git-clone
-      - run: sudo corepack enable
+      - run: corepack enable
       - attach_workspace:
           at: .
       - run:
@@ -827,10 +828,10 @@ jobs:
             - builds-test
 
   prep-build-test-mv2:
-    executor: node-browsers-medium-plus
+    executor: node-linux-medium
     steps:
       - run: *shallow-git-clone
-      - run: sudo corepack enable
+      - run: corepack enable
       - attach_workspace:
           at: .
       - run:
@@ -851,10 +852,10 @@ jobs:
             - builds-test-mv2
 
   prep-build-confirmation-redesign-test:
-    executor: node-browsers-medium-plus
+    executor: node-linux-medium
     steps:
       - run: *shallow-git-clone
-      - run: sudo corepack enable
+      - run: corepack enable
       - attach_workspace:
           at: .
       - run:
@@ -873,10 +874,10 @@ jobs:
             - builds-test-confirmations
 
   prep-build-confirmation-redesign-test-mv2:
-    executor: node-browsers-medium-plus
+    executor: node-linux-medium
     steps:
       - run: *shallow-git-clone
-      - run: sudo corepack enable
+      - run: corepack enable
       - attach_workspace:
           at: .
       - run:
@@ -895,10 +896,10 @@ jobs:
             - builds-test-confirmations-mv2
 
   prep-build-storybook:
-    executor: node-browsers-medium-plus
+    executor: node-linux-medium
     steps:
       - run: *shallow-git-clone
-      - run: sudo corepack enable
+      - run: corepack enable
       - attach_workspace:
           at: .
       - run:
@@ -1594,22 +1595,6 @@ jobs:
             git config user.email metamaskbot@users.noreply.github.com
             yarn ts-migration:dashboard:deploy
 
-  test-unit-mocha:
-    executor: node-browsers-small
-    steps:
-      - run: *shallow-git-clone
-      - run: sudo corepack enable
-      - attach_workspace:
-          at: .
-      - run:
-          name: test:coverage:mocha
-          command: yarn test:coverage:mocha
-      - persist_to_workspace:
-          root: .
-          paths:
-            - .nyc_output
-            - coverage
-
   test-unit-jest-development:
     executor: node-browsers-small
     steps:

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -269,6 +269,7 @@ module.exports = {
       excludedFiles: [
         'app/scripts/controllers/app-state.test.js',
         'app/scripts/controllers/mmi-controller.test.js',
+        'app/scripts/metamask-controller.actions.test.js',
         'app/scripts/detect-multiple-instances.test.js',
         'app/scripts/controllers/swaps.test.js',
         'app/scripts/controllers/metametrics.test.js',
@@ -303,6 +304,7 @@ module.exports = {
         '**/__snapshots__/*.snap',
         'app/scripts/controllers/app-state.test.js',
         'app/scripts/controllers/mmi-controller.test.ts',
+        'app/scripts/metamask-controller.actions.test.js',
         'app/scripts/detect-multiple-instances.test.js',
         'app/scripts/controllers/swaps.test.js',
         'app/scripts/controllers/metametrics.test.js',

diff --git a/.mocharc.js b/.mocharc.js
@@ -8,6 +8,7 @@ module.exports = {
     './app/scripts/controllers/app-state.test.js',
     './app/scripts/controllers/permissions/**/*.test.js',
     './app/scripts/controllers/mmi-controller.test.ts',
+    './app/scripts/metamask-controller.actions.test.js',
     './app/scripts/detect-multiple-instances.test.js',
     './app/scripts/controllers/swaps.test.js',
     './app/scripts/controllers/metametrics.test.js',