Merge remote-tracking branch 'origin/next' into merge-train/barretenberg

Author: lucasxia01

CI.md

@@ -23,7 +23,7 @@ CI3:
   - Restricting resources such a vcpus, memory and storage.
   - Building a single final slim release image from `release-image`.
 - Provides a consistent command interface on `./bootstrap.sh` scripts, e.g. `./bootstrap.sh clean|fast|full|test|test_cmds`.
-- Unifies how projects are tested allowing for a "build then test the entire repo" workflow. Projects expose their individual tests via `test_cmds` and they can all be parallelised at once to leverage maximum system throughput.
+- Unifies how projects are tested allowing for a "build then test the entire repo" workflow. Projects expose their individual tests via `test_cmds` and they can all be parallelized at once to leverage maximum system throughput.
 - Runs on a single (currently large, 128 vcpu) machine.
 - Significantly reduces the chance of flakey tests making their way into master, by "grinding" the tests in the master merge queue. This simply executes the tests as above, but across N instances. (TBD)
 - Provides a shared redis cache at the test level, meaning the same test never needs to be run twice in CI (except when grinding).
@@ -323,7 +323,7 @@ dl e6b8532f0c020b44
 Let's say you open up a test run log, you'll see something like:
 
 ```
-Command: parallelise 64 (exit: 0)
+Command: parallelize 64 (exit: 0)
 Starting test run with max 64 jobs...
 PASSED (http://ci.aztec-labs.com/736ae186bdf66226): yarn-project/end-to-end/scripts/run_test.sh simple e2e_synching
 PASSED (http://ci.aztec-labs.com/066e837f7af23761): yarn-project/end-to-end/scripts/run_test.sh simple e2e_public_testnet_transfer

aztec-up/bootstrap.sh

@@ -32,7 +32,7 @@ function test_cmds {
 
 function test {
   echo_header "aztec-up test"
-  test_cmds | filter_test_cmds | parallelise
+  test_cmds | filter_test_cmds | parallelize
 }
 
 function release {

barretenberg/acir_tests/README.md

@@ -42,5 +42,5 @@ scripts/bb_prove.sh assert_statement
 Programmatically, you can also do from root:
 
 ```bash
-./barretenberg/acir_tests/bootstrap.sh test_cmds | grep assert_statement | ci3/parallelise
+./barretenberg/acir_tests/bootstrap.sh test_cmds | grep assert_statement | ci3/parallelize
 ```

barretenberg/acir_tests/bootstrap.sh

@@ -131,7 +131,7 @@ function build {
 
 function test {
   echo_header "acir_tests testing"
-  test_cmds | filter_test_cmds | parallelise
+  test_cmds | filter_test_cmds | parallelize
 }
 
 # Prints to stdout, one per line, the command to execute each individual test.
@@ -213,7 +213,7 @@ function bench_cmds {
 # TODO(https://github.com/AztecProtocol/barretenberg/issues/1254): More complete testing, including failure tests
 function bench {
   rm -rf bench-out && mkdir -p bench-out
-  bench_cmds | STRICT_SCHEDULING=1 parallelise
+  bench_cmds | STRICT_SCHEDULING=1 parallelize
 }
 
 case "$cmd" in

barretenberg/bbup/bootstrap.sh

@@ -19,7 +19,7 @@ function test_cmds {
 # This is not called in ci. It is just for a developer to run the tests.
 function test {
   echo_header "bbup test"
-  test_cmds | filter_test_cmds | parallelise
+  test_cmds | filter_test_cmds | parallelize
 }
 
 case "$cmd" in

barretenberg/bbup/install

@@ -12,7 +12,7 @@ ERROR="✗"
 
 BB_DIR="${HOME}/.bb"
 INSTALL_PATH="${BB_DIR}/bbup"
-BBUP_URL="https://raw.githubusercontent.com/AztecProtocol/aztec-packages/master/barretenberg/bbup/bbup"
+BBUP_URL="https://raw.githubusercontent.com/AztecProtocol/aztec-packages/next/barretenberg/bbup/bbup"
 
 # Create .bb directory if it doesn't exist
 mkdir -p "$BB_DIR"

barretenberg/cpp/bootstrap.sh

@@ -231,7 +231,7 @@ function test_cmds {
 # This is not called in ci. It is just for a developer to run the tests.
 function test {
   echo_header "bb test"
-  test_cmds | filter_test_cmds | parallelise
+  test_cmds | filter_test_cmds | parallelize
 }
 
 function build_bench {
@@ -260,7 +260,7 @@ function bench_cmds {
 function bench {
   echo_header "bb bench"
   rm -rf bench-out && mkdir -p bench-out
-  bench_cmds | STRICT_SCHEDULING=1 parallelise
+  bench_cmds | STRICT_SCHEDULING=1 parallelize
 }
 
 # Upload assets to release.
@@ -328,7 +328,7 @@ case "$cmd" in
     echo "Running commands:"
     ivc_bench_cmds "$flow_filter"
 
-    ivc_bench_cmds "$flow_filter" | STRICT_SCHEDULING=1 parallelise
+    ivc_bench_cmds "$flow_filter" | STRICT_SCHEDULING=1 parallelize
     ;;
   "hash")
     echo $hash

barretenberg/cpp/scripts/test_civc_standalone_vks_havent_changed.sh

@@ -11,7 +11,7 @@ cd ..
 # - Generate a hash for versioning: sha256sum bb-civc-inputs.tar.gz
 # - Upload the compressed results: aws s3 cp bb-civc-inputs.tar.gz s3://aztec-ci-artifacts/protocol/bb-civc-inputs-[hash(0:8)].tar.gz
 # Note: In case of the "Test suite failed to run ... Unexpected token 'with' " error, need to run: docker pull aztecprotocol/build:3.0
-pinned_short_hash="93eaa5ec"
+pinned_short_hash="2614fe09"
 pinned_civc_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-civc-inputs-${pinned_short_hash}.tar.gz"
 
 function compress_and_upload {

barretenberg/cpp/scripts/test_coverage.sh

@@ -20,7 +20,7 @@ function test_cmds {
   # ../acir_tests/bootstrap.sh test_cmds | grep -v main.js | grep -v browser
   # echo "disabled-cache NO_WASM=1 barretenberg/cpp/bootstrap.sh bench_ivc origin/master"
 }
-(test_cmds || exit 1) | parallelise
+(test_cmds || exit 1) | parallelize
 # Run llvm-profdata to merge raw profiles
 llvm-profdata-16 merge -sparse build-coverage/profdata/*.profraw -o build-coverage/coverage.profdata
 

barretenberg/cpp/src/barretenberg/commitment_schemes/shplonk/shplonk.hpp

@@ -381,7 +381,7 @@ template <typename Curve> class ShplonkVerifier_ {
         pows_of_nu.reserve(num_claims);
 
         commitments.insert(commitments.end(), polynomial_commitments.begin(), polynomial_commitments.end());
-        scalars.insert(scalars.end(), commitments.size() - 1, Fr(0)); // Initialised as circuit constants
+        scalars.insert(scalars.end(), commitments.size() - 1, Fr(0)); // Initialized as circuit constants
         // The first two powers of nu have already been initialized, we need another `num_claims - 2` powers to batch
         // all the claims
         for (size_t idx = 0; idx < num_claims - 2; idx++) {