fix(ci): run contract-snapshots tests in CI (#23895)

## The gap

This draft exists just so display the first half of a red-green flow. We
should merge the child PR
#23896 into this one
before merging.

The contract-snapshots suite (added in #23061) has never run in CI. It
was wired only into the `noir-projects/bootstrap.sh test_cmds`
aggregate, but the Makefile-driven CI never invokes parent aggregates:
it calls each subproject's `test_cmds` directly
(`noir-protocol-circuits-tests` in `fast`, `noir-projects-txe-tests`
post-build). The aggregate is a local-dev entry point only.

Consequences so far:
- the noir 1.0.0-beta.22 bump (#23870) landed green with stale snapshots
(see #23878),
- aztec-nr changes since the last regen in #23464 have drifted the
snapshots unnoticed. 14 of 61 tests fail on this branch with its own
pinned nargo.

## The fix

- New `contract-snapshots-tests` Makefile target (mirrors
`noir-protocol-circuits-tests`, depends only on `noir` for the nargo
binary), included in `fast`.
- Comment on the bootstrap aggregate marking it local-dev only, so the
next suite added there also gets a Makefile target.

## Expected CI result

This PR is intentionally red: the newly wired suite fails with the 14
drifted snapshots, demonstrating the gap. A follow-up PR targeting this
branch regenerates the snapshots and turns it green. Merge order: regen
PR into this branch, then this branch into the train.

Draft with `ci-draft` label so CI runs while merge automation stays off
until the regen lands.

---------

Co-authored-by: AztecBot <tech@aztec-labs.com>

Author: vezenovm

Makefile

@@ -55,7 +55,7 @@ endef
 
 # Fast bootstrap.
 fast: release-image barretenberg boxes playground docs aztec-up \
-		  bb-tests l1-contracts-tests yarn-project-tests boxes-tests playground-tests aztec-up-tests docs-tests noir-protocol-circuits-tests release-image-tests spartan claude-tests
+		  bb-tests l1-contracts-tests yarn-project-tests boxes-tests playground-tests aztec-up-tests docs-tests noir-protocol-circuits-tests contract-snapshots-tests release-image-tests spartan claude-tests
 
 # Full bootstrap.
 full: fast bb-full-tests bb-cpp-full yarn-project-benches
@@ -308,6 +308,9 @@ noir-projects-txe-tests:
 	$(call test,$@,noir-projects/aztec-nr)
 	$(call test,$@,noir-projects/noir-contracts)
 
+contract-snapshots-tests: noir
+	$(call test,$@,noir-projects/contract-snapshots)
+
 # Noir Projects - Aggregate target (builds all sub-projects)
 noir-projects: noir-protocol-circuits mock-protocol-circuits noir-contracts aztec-nr
 

noir-projects/bootstrap.sh

@@ -30,6 +30,9 @@ function build {
     aztec-nr
 }
 
+# Local-dev entry only (via ./bootstrap.sh test). CI does not run this aggregate:
+# the root Makefile wires each subproject's test_cmds individually, so a new
+# suite must also get a Makefile target to run in CI.
 function test_cmds {
   parallel -k ./{}/bootstrap.sh test_cmds ::: noir-protocol-circuits noir-contracts aztec-nr contract-snapshots
 }

noir-projects/contract-snapshots/README.md

@@ -3,7 +3,7 @@
 `cargo insta` snapshot tests for noir contracts. Two test categories live here:
 
 - **`expand/`** — runs `nargo expand` on a curated set of aztec-nr contracts (mirrors what CI benchmarks already exercise) and snapshots the expanded source. Surface for catching macro regressions that pass typechecking but silently change generated code.
-- **`compile_failure/`** — drives `nargo compile` on intentionally invalid aztec-nr contracts and snapshots the full stderr.
+- **`compile_failure/`** — drives `nargo compile` on intentionally invalid aztec-nr contracts and snapshots the full stderr. Locations inside the aztec-nr macro sources are scrubbed to `<line>`/`<col>` markers (like the `<repo>` path marker) so macro edits don't churn every snapshot; locations in the test program itself and in the stdlib are kept.
 
 ### Layout
 

noir-projects/contract-snapshots/tests/snapshots.rs

@@ -38,15 +38,71 @@ fn nargo(dir: &Path) -> Command {
 ///    emits when concurrent test invocations contend on its git-deps cache.
 /// 2. Replaces the absolute repo prefix with `<repo>` so call-stack lines
 ///    pointing into `aztec-nr/aztec/src/macros/...` are stable across machines.
+/// 3. Replaces `:line:col` suffixes on `<repo>` lines with `:<line>:<col>`, and
+///    blanks code-frame gutter numbers in frames headed by a `<repo>` path.
+///    Any macro edit shifts these positions, which would churn every
+///    snapshot with diffs that carry no signal: the tests verify error text,
+///    user-code locations and call-stack shape, not exact positions inside the
+///    macro sources. Locations in the test program itself (`src/main.nr`) and
+///    in the stdlib are kept. Alignment padding derived from the gutter digit
+///    width is left alone, so a macro line number crossing a digit-count
+///    boundary can still produce a whitespace-only diff.
 fn scrub_stderr(s: String) -> String {
     let prefix = format!("{}/", repo_root().display());
+    let mut in_repo_frame = false;
     s.lines()
         .filter(|l| !l.contains("Waiting for lock"))
-        .map(|l| l.replace(&prefix, "<repo>/"))
+        .map(|l| {
+            let l = l.replace(&prefix, "<repo>/");
+            let trimmed = l.trim_start();
+            if trimmed.is_empty() {
+                in_repo_frame = false;
+            } else if trimmed.starts_with("┌─") {
+                in_repo_frame = trimmed.contains("<repo>/");
+            }
+            if l.contains("<repo>/") {
+                scrub_location_suffix(&l)
+            } else if in_repo_frame {
+                scrub_gutter_number(&l).unwrap_or(l)
+            } else {
+                l
+            }
+        })
         .collect::<Vec<_>>()
         .join("\n")
 }
 
+/// `...aztec.nr:111:21` -> `...aztec.nr:<line>:<col>`; lines without a
+/// trailing `:line:col` are returned unchanged.
+fn scrub_location_suffix(l: &str) -> String {
+    let is_num = |s: &str| !s.is_empty() && s.bytes().all(|b| b.is_ascii_digit());
+    if let Some((rest, col)) = l.rsplit_once(':') {
+        if is_num(col) {
+            if let Some((rest, line)) = rest.rsplit_once(':') {
+                if is_num(line) {
+                    return format!("{rest}:<line>:<col>");
+                }
+            }
+        }
+    }
+    l.to_string()
+}
+
+/// ` 164 │ some code` -> `     │ some code` for code-frame gutter lines.
+fn scrub_gutter_number(l: &str) -> Option<String> {
+    let trimmed = l.trim_start();
+    let indent = l.len() - trimmed.len();
+    let digits = trimmed.find(|c: char| !c.is_ascii_digit())?;
+    if digits == 0 || !trimmed[digits..].starts_with(" │") {
+        return None;
+    }
+    Some(format!(
+        "{}{}",
+        " ".repeat(indent + digits),
+        &trimmed[digits..]
+    ))
+}
+
 /// Asserts `nargo compile` fails for `dir` and snapshots scrubbed stderr
 fn run_compile_failure(name: &str, dir: PathBuf) {
     let out = nargo(&dir)

noir-projects/contract-snapshots/tests/snapshots/compile_failure/allow_phase_change_on_non_external_fn/snapshots__stderr.snap

@@ -12,6 +12,6 @@ error: The #[allow_phase_change] attribute can only be applied to #[external("pr
     1: ?
             at src/main.nr:11:5
     2: allow_phase_change
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/functions/mod.nr:166:9
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/functions/mod.nr:<line>:<col>
 
 Aborting due to 1 previous error

noir-projects/contract-snapshots/tests/snapshots/compile_failure/allow_phase_change_on_utility_fn/snapshots__stderr.snap

@@ -12,8 +12,8 @@ error: The #[allow_phase_change] attribute cannot be applied to #[external("util
     1: ?
             at src/main.nr:9:5
     2: external
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/functions/mod.nr:355:9
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/functions/mod.nr:<line>:<col>
     3: assert_valid_utility
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/functions/mod.nr:505:9
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/functions/mod.nr:<line>:<col>
 
 Aborting due to 1 previous error

noir-projects/contract-snapshots/tests/snapshots/compile_failure/authorization_selector_collision/snapshots__stderr.snap

@@ -3,9 +3,9 @@ source: tests/snapshots.rs
 expression: stderr
 ---
 error: Trait crate::authwit::authorization_interface::AuthorizationInterface not found
-   ┌─ <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:36:43
+   ┌─ <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:<line>:<col>
    │
-36 │     let authorization_interface = quote { crate::authwit::authorization_interface::AuthorizationInterface };
+   │     let authorization_interface = quote { crate::authwit::authorization_interface::AuthorizationInterface };
    │                                           ---------------------------------------------------------------
    │
    ┌─ src/main.nr:24:5
@@ -15,9 +15,9 @@ error: Trait crate::authwit::authorization_interface::AuthorizationInterface not
    │
 
 error: Could not resolve 'authwit' in path
-   ┌─ <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:37:54
+   ┌─ <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:<line>:<col>
    │
-37 │     let authorization_selector_type = quote { crate::authwit::AuthorizationSelector };
+   │     let authorization_selector_type = quote { crate::authwit::AuthorizationSelector };
    │                                                      -------
    │
    ┌─ src/main.nr:24:5
@@ -27,9 +27,9 @@ error: Could not resolve 'authwit' in path
    │
 
 error: check_trait_impl_where_clause_matches_trait_where_clause: missing trait ID
-   ┌─ <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:23:16
+   ┌─ <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:<line>:<col>
    │
-23 │     let name = s.name();
+   │     let name = s.name();
    │                --------
    │
    ┌─ src/main.nr:24:5
@@ -39,9 +39,9 @@ error: check_trait_impl_where_clause_matches_trait_where_clause: missing trait I
    │
 
 error: check_trait_impl_method_matches_declaration: missing trait impl
-   ┌─ <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:42:16
+   ┌─ <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:<line>:<col>
    │
-42 │             fn get_authorization_selector(self) -> $authorization_selector_type {
+   │             fn get_authorization_selector(self) -> $authorization_selector_type {
    │                --------------------------
    │
    ┌─ src/main.nr:24:5
@@ -60,8 +60,8 @@ error: Selector collision detected between authorizations 'EventCollision8370082
     1: AuthorizationSelectorCollision::#[authorization]
             at src/main.nr:27:5
     2: authorization
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:65:5
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:<line>:<col>
     3: register_authorization
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:15:9
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:<line>:<col>
 
 Aborting due to 5 previous errors

noir-projects/contract-snapshots/tests/snapshots/compile_failure/authorize_once_from_wrong_type/snapshots__stderr.snap

@@ -12,16 +12,16 @@ error: Argument from in function foo must be of type AztecAddress, but is of typ
     1: #[aztec]
             at src/main.nr:4:1
     2: aztec
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/aztec.nr:111:21
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/aztec.nr:<line>:<col>
     3: process_functions
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/mod.nr:48:9
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/mod.nr:<line>:<col>
     4: [T]::map
             at std/vector.nr:67:33
     5: process_functions
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/mod.nr:48:41
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/mod.nr:<line>:<col>
     6: generate_public_external
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/public.nr:131:9
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/public.nr:<line>:<col>
     7: create_authorize_once_check
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/helpers.nr:72:9
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/helpers.nr:<line>:<col>
 
 Aborting due to 1 previous error

noir-projects/contract-snapshots/tests/snapshots/compile_failure/authorize_once_missing_from_param/snapshots__stderr.snap

@@ -12,16 +12,16 @@ error: Function foo does not have a from parameter. Please specify which one to
     1: #[aztec]
             at src/main.nr:4:1
     2: aztec
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/aztec.nr:111:21
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/aztec.nr:<line>:<col>
     3: process_functions
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/mod.nr:48:9
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/mod.nr:<line>:<col>
     4: [T]::map
             at std/vector.nr:67:33
     5: process_functions
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/mod.nr:48:41
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/mod.nr:<line>:<col>
     6: generate_public_external
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/public.nr:131:9
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/public.nr:<line>:<col>
     7: create_authorize_once_check
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/helpers.nr:67:9
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/helpers.nr:<line>:<col>
 
 Aborting due to 1 previous error

noir-projects/contract-snapshots/tests/snapshots/compile_failure/authorize_once_missing_nonce_param/snapshots__stderr.snap

@@ -12,16 +12,16 @@ error: Function foo does not have a authwit_nonce. Please specify which one to u
     1: #[aztec]
             at src/main.nr:4:1
     2: aztec
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/aztec.nr:111:21
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/aztec.nr:<line>:<col>
     3: process_functions
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/mod.nr:48:9
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/mod.nr:<line>:<col>
     4: [T]::map
             at std/vector.nr:67:33
     5: process_functions
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/mod.nr:48:41
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/mod.nr:<line>:<col>
     6: generate_public_external
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/public.nr:131:9
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/public.nr:<line>:<col>
     7: create_authorize_once_check
-            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/helpers.nr:81:9
+            at <repo>/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/helpers.nr:<line>:<col>
 
 Aborting due to 1 previous error