chore: update formatter tests

noir-lang · Apr 20, 2024 · 0445ec5 · 0445ec5
1 parent 5453a68
commit 0445ec5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/tooling/nargo_fmt/src/visitor/item.rs b/tooling/nargo_fmt/src/visitor/item.rs
@@ -220,6 +220,8 @@ impl super::FmtVisitor<'_> {
                     self.push_rewrite(use_tree, span);
                     self.last_position = span.end();
                 }
+
+                // TODO: rewrite instances of "Field" into "field" in these items.
                 ItemKind::Struct(_)
                 | ItemKind::Trait(_)
                 | ItemKind::TraitImpl(_)

diff --git a/tooling/nargo_fmt/tests/expected/contract.nr b/tooling/nargo_fmt/tests/expected/contract.nr
@@ -16,7 +16,7 @@ contract Benchmarking {
 
     struct Storage {
         notes: Map<AztecAddress, PrivateSet<ValueNote, VALUE_NOTE_LEN>>,
-        balances: Map<AztecAddress, PublicMutable<field, field_SERIALIZED_LEN>>,
+        balances: Map<AztecAddress, PublicMutable<Field, FIELD_SERIALIZED_LEN>>,
     }
 
     impl Storage {

diff --git a/tooling/nargo_fmt/tests/expected/module.nr b/tooling/nargo_fmt/tests/expected/module.nr
@@ -1,7 +1,7 @@
 mod a {
     mod b {
         struct Data {
-            a: field
+            a: Field
         }
     }
 

diff --git a/tooling/nargo_fmt/tests/expected/struct.nr b/tooling/nargo_fmt/tests/expected/struct.nr
@@ -1,11 +1,11 @@
 struct Foo {
-    bar: field,
-    array: [field; 2],
+    bar: Field,
+    array: [Field; 2],
 }
 
 struct Pair {
     first: Foo,
-    second: field,
+    second: Field,
 }
 
 impl Foo {
@@ -25,8 +25,8 @@ impl Pair {
 }
 
 struct Nested {
-    a: field,
-    b: field
+    a: Field,
+    b: Field
 }
 struct MyStruct {
     my_bool: bool,
@@ -39,7 +39,7 @@ fn test_struct_in_tuple(a_bool: bool, x: field, y: field) -> (MyStruct, bool) {
 }
 
 struct Animal {
-    legs: field,
+    legs: Field,
     eyes: u8,
 }
 

diff --git a/tooling/nargo_fmt/tests/input/contract.nr b/tooling/nargo_fmt/tests/input/contract.nr
@@ -63,7 +63,7 @@ contract Benchmarking {
         storage.balances.at(owner).write(current + value);
         let _callStackItem1 = context.call_public_function(
             context.this_address(),
-            FunctionSelector::from_signature("broadcast(Field)"),
+            FunctionSelector::from_signature("broadcast(field)"),
             [owner]
         );
     }