chore: make some assert statements more idiomatic (#85)

Author: TomAFrench

src/get_object.nr

@@ -70,10 +70,13 @@ impl<let NumBytes: u32, let NumPackedFields: u32, let MaxNumTokens: u32, let Max
 
         let (exists, key_index) = self.key_exists_impl_var(key);
         let entry: JSONEntry = self.json_entries_packed[key_index].into();
-        assert(
-            (entry.entry_type - END_OBJECT_TOKEN as Field) * exists as Field == 0,
-            "get_object: entry exists but is not an object!",
-        );
+        if exists {
+            assert_eq(
+                entry.entry_type,
+                END_OBJECT_TOKEN as Field,
+                "get_object: entry exists but is not an object!",
+            );
+        }
 
         let result = self.update_json_object(entry, key_index);
 
@@ -94,8 +97,9 @@ impl<let NumBytes: u32, let NumPackedFields: u32, let MaxNumTokens: u32, let Max
         assert(self.layer_type_of_root != ARRAY_LAYER, "cannot extract array elements via a key");
         let (entry, key_index) = self.get_json_entry_unchecked_with_key_index_var(key);
         let entry: JSONEntry = self.json_entries_packed[key_index].into();
-        assert(
-            entry.entry_type == END_OBJECT_TOKEN as Field,
+        assert_eq(
+            entry.entry_type,
+            END_OBJECT_TOKEN as Field,
             "get_object: entry exists but is not an object!",
         );
 
@@ -107,8 +111,9 @@ impl<let NumBytes: u32, let NumPackedFields: u32, let MaxNumTokens: u32, let Max
      * @description returns an Option<JSON> where, if the object exists, the JSON object will have the requested object as its root value  
      **/
     pub(crate) fn get_object_from_array(self, array_index: Field) -> Option<Self> {
-        assert(
-            self.layer_type_of_root == ARRAY_LAYER,
+        assert_eq(
+            self.layer_type_of_root,
+            ARRAY_LAYER,
             "can only acceess array elements from array",
         );
 
@@ -141,8 +146,9 @@ impl<let NumBytes: u32, let NumPackedFields: u32, let MaxNumTokens: u32, let Max
      * @description will revert if the object does not exist
      **/
     pub(crate) fn get_object_from_array_unchecked(self, array_index: Field) -> Self {
-        assert(
-            self.layer_type_of_root == ARRAY_LAYER,
+        assert_eq(
+            self.layer_type_of_root,
+            ARRAY_LAYER,
             "can only acceess array elements from array",
         );
 
@@ -154,8 +160,9 @@ impl<let NumBytes: u32, let NumPackedFields: u32, let MaxNumTokens: u32, let Max
         let entry_index = (parent_entry.child_pointer + array_index);
 
         let entry: JSONEntry = self.json_entries_packed[cast_num_to_u32(entry_index)].into();
-        assert(
-            entry.entry_type == END_OBJECT_TOKEN as Field,
+        assert_eq(
+            entry.entry_type,
+            END_OBJECT_TOKEN as Field,
             "get_object_from_array_unchecked: entry exists but is not an object!",
         );
 

src/get_string.nr

@@ -152,10 +152,13 @@ impl<let NumBytes: u32, let NumPackedFields: u32, let MaxNumTokens: u32, let Max
         key: BoundedVec<u8, KeyBytes>,
     ) -> Option<BoundedVec<u8, StringBytes>> {
         let (exists, entry) = self.get_json_entry_var(key);
-        assert(
-            (entry.entry_type - STRING_TOKEN as Field) * exists as Field == 0,
-            "get_string: entry exists but is not a string!",
-        );
+        if exists {
+            assert_eq(
+                entry.entry_type,
+                STRING_TOKEN as Field,
+                "get_string: entry exists but is not a string!",
+            );
+        }
         let mut parsed_string: [u8; StringBytes] = self.extract_string_entry(entry);
         let parsed_string: BoundedVec<u8, StringBytes> = process_escape_sequences(
             BoundedVec::from_parts_unchecked(parsed_string, entry.json_length as u32),
@@ -176,8 +179,9 @@ impl<let NumBytes: u32, let NumPackedFields: u32, let MaxNumTokens: u32, let Max
         key: BoundedVec<u8, KeyBytes>,
     ) -> BoundedVec<u8, StringBytes> {
         let entry = self.get_json_entry_unchecked_var(key);
-        assert(
-            entry.entry_type == STRING_TOKEN as Field,
+        assert_eq(
+            entry.entry_type,
+            STRING_TOKEN as Field,
             "get_string_unchecked: entry exists but is not a string!",
         );
         let parsed_string = BoundedVec::from_parts_unchecked(
@@ -195,8 +199,9 @@ impl<let NumBytes: u32, let NumPackedFields: u32, let MaxNumTokens: u32, let Max
         self,
         array_index: Field,
     ) -> Option<BoundedVec<u8, StringBytes>> {
-        assert(
-            self.layer_type_of_root == ARRAY_LAYER,
+        assert_eq(
+            self.layer_type_of_root,
+            ARRAY_LAYER,
             "can only acceess array elements from array",
         );
 
@@ -235,9 +240,10 @@ impl<let NumBytes: u32, let NumPackedFields: u32, let MaxNumTokens: u32, let Max
         self,
         array_index: Field,
     ) -> BoundedVec<u8, StringBytes> {
-        assert(
-            self.layer_type_of_root == ARRAY_LAYER,
-            "can only acceess array elements from array",
+        assert_eq(
+            self.layer_type_of_root,
+            ARRAY_LAYER,
+            "can only access array elements from array",
         );
 
         let parent_entry: JSONEntry =
@@ -249,8 +255,9 @@ impl<let NumBytes: u32, let NumPackedFields: u32, let MaxNumTokens: u32, let Max
 
         let entry: JSONEntry = self.json_entries_packed[cast_num_to_u32(entry_index)].into();
 
-        assert(
-            entry.entry_type == STRING_TOKEN as Field,
+        assert_eq(
+            entry.entry_type,
+            STRING_TOKEN as Field,
             "get_string_from_array_unchecked: entry exists but is not a string!",
         );
 
@@ -375,8 +382,9 @@ impl<let NumBytes: u32, let NumPackedFields: u32, let MaxNumTokens: u32, let Max
         self,
         array_index: Field,
     ) -> Option<JSONValue<StringBytes>> {
-        assert(
-            self.layer_type_of_root == ARRAY_LAYER,
+        assert_eq(
+            self.layer_type_of_root,
+            ARRAY_LAYER,
             "can only acceess array elements from array",
         );
 
@@ -420,8 +428,9 @@ impl<let NumBytes: u32, let NumPackedFields: u32, let MaxNumTokens: u32, let Max
         self,
         array_index: Field,
     ) -> JSONValue<StringBytes> {
-        assert(
-            self.layer_type_of_root == ARRAY_LAYER,
+        assert_eq(
+            self.layer_type_of_root,
+            ARRAY_LAYER,
             "can only acceess array elements from array",
         );
 
@@ -434,8 +443,9 @@ impl<let NumBytes: u32, let NumPackedFields: u32, let MaxNumTokens: u32, let Max
 
         let entry: JSONEntry = self.json_entries_packed[cast_num_to_u32(entry_index)].into();
 
-        assert(
-            entry.entry_type == STRING_TOKEN as Field,
+        assert_eq(
+            entry.entry_type,
+            STRING_TOKEN as Field,
             "get_string_from_array_unchecked: entry exists but is not a string!",
         );