Merge branch 'master' into 12-09-chore_removing_noir_bug_workaround

AztecProtocol · Dec 9, 2024 · 0954857 · 0954857
2 parents e6807a9 + 4fa068c
commit 0954857
Show file tree

Hide file tree

Showing 41 changed files with 98 additions and 47 deletions.
diff --git a/.github/workflows/nightly-kind-test.yml b/.github/workflows/nightly-kind-test.yml
@@ -77,7 +77,7 @@ jobs:
             ./spartan/scripts/setup_local_k8s.sh
             cd yarn-project/end-to-end
             export FORCE_COLOR=1
-            NAMESPACE=${{ matrix.test }} FRESH_INSTALL=true CLEANUP_CLUSTER=true VALUES_FILE="16-validators.yaml" ./scripts/network_test.sh ./src/spartan/${{ matrix.test }}.test.ts || true
+            NAMESPACE=${{ matrix.test }} FRESH_INSTALL=true CLEANUP_CLUSTER=true VALUES_FILE="16-validators.yaml" ./scripts/network_test.sh ./src/spartan/${{ matrix.test }}.test.ts
 
   proving-test:
     needs: build
@@ -104,7 +104,7 @@ jobs:
             ./spartan/scripts/setup_local_k8s.sh
             cd yarn-project/end-to-end
             export FORCE_COLOR=1
-            NAMESPACE=proving FRESH_INSTALL=true CLEANUP_CLUSTER=true INSTALL_TIMEOUT=45m VALUES_FILE="1-validator-with-proving.yaml" ./scripts/network_test.sh ./src/spartan/proving.test.ts || true
+            NAMESPACE=proving FRESH_INSTALL=true CLEANUP_CLUSTER=true INSTALL_TIMEOUT=45m VALUES_FILE="1-validator-with-proving.yaml" ./scripts/network_test.sh ./src/spartan/proving.test.ts
 
   success-check:
     runs-on: ubuntu-20.04

diff --git a/yarn-project/accounts/package.json b/yarn-project/accounts/package.json
@@ -71,7 +71,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/aztec.js": "workspace:^",

diff --git a/yarn-project/archiver/package.json b/yarn-project/archiver/package.json
@@ -61,7 +61,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/circuit-types": "workspace:^",

diff --git a/yarn-project/aztec-faucet/package.json b/yarn-project/aztec-faucet/package.json
@@ -55,7 +55,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/ethereum": "workspace:^",

diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json
@@ -57,7 +57,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/archiver": "workspace:^",

diff --git a/yarn-project/aztec.js/package.json b/yarn-project/aztec.js/package.json
@@ -73,7 +73,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/circuit-types": "workspace:^",

diff --git a/yarn-project/aztec/package.json b/yarn-project/aztec/package.json
@@ -109,7 +109,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "engines": {
     "node": ">=18"

diff --git a/yarn-project/bb-prover/package.json b/yarn-project/bb-prover/package.json
@@ -62,7 +62,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/circuit-types": "workspace:^",

diff --git a/yarn-project/bot/package.json b/yarn-project/bot/package.json
@@ -49,7 +49,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/accounts": "workspace:^",

diff --git a/yarn-project/builder/package.json b/yarn-project/builder/package.json
@@ -65,7 +65,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/foundation": "workspace:^",

diff --git a/yarn-project/circuit-types/package.json b/yarn-project/circuit-types/package.json
@@ -63,7 +63,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/circuits.js": "workspace:^",

diff --git a/yarn-project/circuits.js/package.json b/yarn-project/circuits.js/package.json
@@ -97,6 +97,7 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   }
 }
diff --git a/yarn-project/cli-wallet/package.json b/yarn-project/cli-wallet/package.json
@@ -63,7 +63,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/accounts": "workspace:^",

diff --git a/yarn-project/cli/package.json b/yarn-project/cli/package.json
@@ -63,7 +63,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/archiver": "workspace:^",

diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json
@@ -155,6 +155,7 @@
       "^(\\.{1,2}/.*)\\.[cm]?js$": "$1"
     },
     "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "testTimeout": 30000
   }
 }
diff --git a/yarn-project/entrypoints/package.json b/yarn-project/entrypoints/package.json
@@ -59,7 +59,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/aztec.js": "workspace:^",

diff --git a/yarn-project/epoch-cache/package.json b/yarn-project/epoch-cache/package.json
@@ -86,7 +86,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "engines": {
     "node": ">=18"

diff --git a/yarn-project/ethereum/package.json b/yarn-project/ethereum/package.json
@@ -85,9 +85,10 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "engines": {
     "node": ">=18"
   }
-}
+}
diff --git a/yarn-project/foundation/package.json b/yarn-project/foundation/package.json
@@ -96,7 +96,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/bb.js": "portal:../../barretenberg/ts",

diff --git a/yarn-project/ivc-integration/package.json b/yarn-project/ivc-integration/package.json
@@ -58,7 +58,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/bb.js": "../../ts",

diff --git a/yarn-project/key-store/package.json b/yarn-project/key-store/package.json
@@ -53,7 +53,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/circuit-types": "workspace:^",

diff --git a/yarn-project/kv-store/package.json b/yarn-project/kv-store/package.json
@@ -90,6 +90,7 @@
       ]
     ],
     "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "testTimeout": 30000
   }
 }
diff --git a/yarn-project/merkle-tree/package.json b/yarn-project/merkle-tree/package.json
@@ -28,7 +28,6 @@
     },
     "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src",
-    "testTimeout": 15000,
     "transform": {
       "^.+\\.tsx?$": [
         "@swc/jest",
@@ -55,7 +54,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/circuit-types": "workspace:^",

diff --git a/yarn-project/noir-contracts.js/package.json b/yarn-project/noir-contracts.js/package.json
@@ -53,7 +53,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/aztec.js": "workspace:^",

diff --git a/yarn-project/noir-protocol-circuits-types/package.json b/yarn-project/noir-protocol-circuits-types/package.json
@@ -57,7 +57,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/circuits.js": "workspace:^",

diff --git a/yarn-project/p2p-bootstrap/package.json b/yarn-project/p2p-bootstrap/package.json
@@ -81,7 +81,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "engines": {
     "node": ">=18"

diff --git a/yarn-project/p2p/package.json b/yarn-project/p2p/package.json
@@ -60,7 +60,7 @@
         }
       ]
     ],
-    "testTimeout": 15000
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/circuit-types": "workspace:^",

diff --git a/yarn-project/package.common.json b/yarn-project/package.common.json
@@ -10,7 +10,11 @@
   "engines": {
     "node": ">=18"
   },
-  "files": ["dest", "src", "!*.test.*"],
+  "files": [
+    "dest",
+    "src",
+    "!*.test.*"
+  ],
   "devDependencies": {
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
@@ -19,7 +23,9 @@
     "ts-node": "^10.9.1"
   },
   "jest": {
-    "extensionsToTreatAsEsm": [".ts"],
+    "extensionsToTreatAsEsm": [
+      ".ts"
+    ],
     "transform": {
       "^.+\\.tsx?$": [
         "@swc/jest",
@@ -39,8 +45,16 @@
     "moduleNameMapper": {
       "^(\\.{1,2}/.*)\\.[cm]?js$": "$1"
     },
-    "reporters": [["default", { "summaryThreshold": 9999 }]],
+    "reporters": [
+      [
+        "default",
+        {
+          "summaryThreshold": 9999
+        }
+      ]
+    ],
+    "testTimeout": 30000,
     "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   }
-}
+}
diff --git a/yarn-project/proof-verifier/package.json b/yarn-project/proof-verifier/package.json
@@ -74,6 +74,7 @@
       ]
     ],
     "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "testTimeout": 30000
   }
 }
diff --git a/yarn-project/protocol-contracts/package.json b/yarn-project/protocol-contracts/package.json
@@ -64,7 +64,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/circuits.js": "workspace:^",

diff --git a/yarn-project/prover-client/package.json b/yarn-project/prover-client/package.json
@@ -63,7 +63,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/bb-prover": "workspace:^",

diff --git a/yarn-project/prover-node/package.json b/yarn-project/prover-node/package.json
@@ -49,7 +49,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/archiver": "workspace:^",

diff --git a/yarn-project/pxe/package.json b/yarn-project/pxe/package.json
@@ -64,7 +64,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "dependencies": {
     "@aztec/bb-prover": "workspace:^",

diff --git a/yarn-project/scripts/package.json b/yarn-project/scripts/package.json
@@ -83,7 +83,8 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   },
   "engines": {
     "node": ">=18"

diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json
@@ -109,6 +109,7 @@
           "summaryThreshold": 9999
         }
       ]
-    ]
+    ],
+    "testTimeout": 30000
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -97,6 +97,7 @@ @@
               "summaryThreshold": 9999
             }
           ]
-        ]
+        ],
+        "testTimeout": 30000
       }
     }