Upgrade all exercises to Cairo 2.7.1

.github/workflows/test.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Getting scarb
         uses: software-mansion/setup-scarb@v1
         with:
-          scarb-version: "2.6.3"
+          scarb-version: "2.7.1"
 
       - name: Verify all exercises
         env:
@@ -56,7 +56,7 @@ jobs:
       - name: Getting scarb
         uses: software-mansion/setup-scarb@v1
         with:
-          scarb-version: "2.6.3"
+          scarb-version: "2.7.1"
 
       - name: Format
         run: ./bin/format_exercises.sh

.tool-versions

@@ -0,0 +1 @@
+scarb 2.7.1

README.md

@@ -59,6 +59,8 @@ _Thoughtful suggestions will likely result faster & more enthusiastic responses
 
 ## Testing
 
+Tests currently use Cairo v2.7.1 (included with Scarb v2.7.1).
+
 To test all exercises, run `./bin/verify-exercises`.
 This command will iterate over all exercises and check to see if their exemplar/example implementation passes all the tests.
 

bin/verify-exercises

@@ -16,9 +16,12 @@ repo=$(git rev-parse --show-toplevel)
 slug="${1:-*}"
 
 if [ "$slug" != "*" ]; then
-    exercises="exercises/*/$slug"
-    if [ ! -f "$exercises" ]; then
-        echo "No such exercises: $slug"
+    if [ -d "$repo/exercises/concept/$slug" ]; then
+        exercises="exercises/concept/$slug"
+    elif [ -d "$repo/exercises/practice/$slug" ]; then
+        exercises="exercises/practice/$slug"
+    else
+        echo "No such exercise: $slug"
         exit 1
     fi
 elif [ "$GITHUB_EVENT_NAME" = "pull_request" ]; then

exercises/concept/low-power-embedded-game/.meta/exemplar.cairo

@@ -34,7 +34,7 @@ pub impl PositionImpl of PositionTrait {
 impl AbsImpl of AbsTrait {
     fn abs(self: @i16) -> u16 {
         let val = if *self < 0 {
-            *self * -1
+            -*self
         } else {
             *self
         };

exercises/concept/low-power-embedded-game/Scarb.toml

@@ -1,4 +1,7 @@
 [package]
 name = "low_power_embedded_game"
 version = "0.1.0"
-edition = "2023_11"
+edition = "2024_07"
+
+[dev-dependencies]
+cairo_test = "2.7.1"

exercises/concept/low-power-embedded-game/tests/low_power_embedded_game.cairo

@@ -72,27 +72,7 @@ mod evens {
 }
 
 mod manhattan {
-    use core::byte_array::ByteArrayTrait;
     use low_power_embedded_game::{Position, PositionTrait};
-    use core::fmt::{Debug, Formatter, Error};
-
-    // Enables printing i16 values in tests.
-    // Note that this will soon be added to the core library.
-    impl IDebug of Debug<i16> {
-        fn fmt(self: @i16, ref f: Formatter) -> Result<(), Error> {
-            if *self < 0 {
-                f.buffer.append(@"-");
-            }
-            let abs_value = if *self < 0 {
-                *self * -1
-            } else {
-                *self
-            };
-            let abs_value: u16 = abs_value.try_into().unwrap();
-            f.buffer.append(@format!("{}", abs_value));
-            Result::Ok(())
-        }
-    }
 
     #[test]
     #[ignore]

exercises/practice/allergies/.meta/example.cairo

@@ -3,7 +3,7 @@ struct Allergies {
     score: u32,
 }
 
-#[derive(Drop, Debug, PartialEq)]
+#[derive(Drop, Copy, Debug, PartialEq)]
 pub enum Allergen {
     Eggs,
     Peanuts,
@@ -15,49 +15,49 @@ pub enum Allergen {
     Cats,
 }
 
+const ALLERGENS: [
+    Allergen
+    ; 8] = [
+    Allergen::Eggs,
+    Allergen::Peanuts,
+    Allergen::Shellfish,
+    Allergen::Strawberries,
+    Allergen::Tomatoes,
+    Allergen::Chocolate,
+    Allergen::Pollen,
+    Allergen::Cats,
+];
+
 #[generate_trait]
 pub impl AllergiesImpl of AllergiesTrait {
     fn new(score: u32) -> Allergies {
         Allergies { score }
     }
 
     fn is_allergic_to(self: @Allergies, allergen: @Allergen) -> bool {
-        let allergens = AllergiesImpl::allergens().span();
+        let allergens = ALLERGENS.span();
+        let mut found = false;
         let mut index = 0;
-        while let Option::Some(next_allergen) = allergens
-            .get(index) {
-                if next_allergen.unbox() == allergen {
-                    break;
-                }
-                index += 1;
-            };
-        index != allergens.len() && (*self.score & pow(2, index)) != 0
+        while let Option::Some(next_allergen) = allergens.get(index) {
+            if next_allergen.unbox() == allergen {
+                found = true;
+                break;
+            }
+            index += 1;
+        };
+        found && (*self.score & pow(2, index)) != 0
     }
 
     fn allergies(self: @Allergies) -> Array<Allergen> {
         let mut result: Array<Allergen> = array![];
-        let mut allergens = AllergiesImpl::allergens();
-        while let Option::Some(allergen) = allergens
-            .pop_front() {
-                if self.is_allergic_to(@allergen) {
-                    result.append(allergen);
-                }
-            };
+        let allergens = ALLERGENS.span();
+        for allergen in allergens {
+            if self.is_allergic_to(allergen) {
+                result.append(*allergen);
+            }
+        };
         result
     }
-
-    fn allergens() -> Array<Allergen> {
-        array![
-            Allergen::Eggs,
-            Allergen::Peanuts,
-            Allergen::Shellfish,
-            Allergen::Strawberries,
-            Allergen::Tomatoes,
-            Allergen::Chocolate,
-            Allergen::Pollen,
-            Allergen::Cats,
-        ]
-    }
 }
 
 fn pow(base: u32, mut power: u32) -> u32 {

exercises/practice/allergies/Scarb.toml

@@ -1,4 +1,7 @@
 [package]
 name = "allergies"
 version = "0.1.0"
-edition = "2023_11"
+edition = "2024_07"
+
+[dev-dependencies]
+cairo_test = "2.7.1"

exercises/practice/allergies/tests/allergies.cairo

@@ -286,22 +286,19 @@ fn compare_allergy_vectors(expected: @Array<Allergen>, actual: @Array<Allergen>)
         );
     }
 
-    let mut i = 0;
-    while let Option::Some(expected_elem) = expected
-        .get(i) {
-            let mut j = 0;
-            while let Option::Some(actual_elem) = actual
-                .get(j) {
-                    if actual_elem.unbox() == expected_elem.unbox() {
-                        break;
-                    }
-                    j += 1;
-                };
-            if j == actual.len() {
-                panic!("Allergen missing\n  {expected_elem:?} should be in {actual:?}");
+    let expected = expected.span();
+    for expected_elem in expected {
+        let mut j = 0;
+        while let Option::Some(actual_elem) = actual.get(j) {
+            if actual_elem.unbox() == expected_elem {
+                break;
             }
-            i += 1;
+            j += 1;
         };
+        if j == actual.len() {
+            panic!("Allergen missing\n  {expected_elem:?} should be in {actual:?}");
+        }
+    };
 }
 
 #[test]

exercises/practice/anagram/.meta/example.cairo

@@ -1,3 +1,5 @@
+use core::dict::Felt252Dict;
+
 #[derive(Drop, Debug)]
 struct Set {
     values: Array<ByteArray>
@@ -35,10 +37,6 @@ impl SetEq of PartialEq<Set> {
             i += 1;
         }
     }
-
-    fn ne(lhs: @Set, rhs: @Set) -> bool {
-        !(lhs == rhs)
-    }
 }
 
 pub fn anagrams_for(word: @ByteArray, candidates: @Set) -> Set {
@@ -79,10 +77,6 @@ impl IgnoreCase of PartialEq<ByteArray> {
             i += 1;
         }
     }
-
-    fn ne(lhs: @ByteArray, rhs: @ByteArray) -> bool {
-        !IgnoreCase::eq(lhs, rhs)
-    }
 }
 
 fn sort_ignore_case(word: @ByteArray) -> ByteArray {
@@ -98,22 +92,21 @@ fn sort_ignore_case(word: @ByteArray) -> ByteArray {
     let mut sorted_word: ByteArray = "";
 
     // append each appearing alphabet ASCII character
-    let mut alphabet_char: u8 = 65; // char 'A'
-    while alphabet_char <= 90 { // char 'Z'
+    let mut alphabet_char: u8 = 'A';
+    while alphabet_char <= 'Z' {
         // process uppercase char
         let mut count = ascii_chars.get(alphabet_char.into());
         while count != 0 {
             sorted_word.append_byte(alphabet_char);
             count -= 1;
         };
         // process lowercase char
-        let lowercase_char = alphabet_char + 32;
+        let lowercase_char = lowercase(@alphabet_char);
         let mut count = ascii_chars.get(lowercase_char.into());
         while count != 0 {
             sorted_word.append_byte(lowercase_char);
             count -= 1;
         };
-
         alphabet_char += 1;
     };
 

exercises/practice/anagram/Scarb.toml

@@ -1,4 +1,7 @@
 [package]
 name = "anagram"
 version = "0.1.0"
-edition = "2023_11"
+edition = "2024_07"
+
+[dev-dependencies]
+cairo_test = "2.7.1"

exercises/practice/anagram/src/lib.cairo

@@ -14,11 +14,6 @@ impl SetEq of PartialEq<Set> {
         // determine whether the two Sets are equal
         panic!("implement `eq`")
     }
-
-    fn ne(lhs: @Set, rhs: @Set) -> bool {
-        // determine whether the two Sets are NOT equal
-        panic!("implement `ne`")
-    }
 }
 
 pub fn anagrams_for(word: @ByteArray, candidates: @Set) -> Set {

exercises/practice/armstrong-numbers/Scarb.toml

@@ -1,4 +1,7 @@
 [package]
 name = "armstrong_numbers"
 version = "0.1.0"
-edition = "2023_11"
+edition = "2024_07"
+
+[dev-dependencies]
+cairo_test = "2.7.1"

exercises/practice/beer-song/Scarb.toml

@@ -1,4 +1,7 @@
 [package]
 name = "beer_song"
 version = "0.1.0"
-edition = "2023_11"
+edition = "2024_07"
+
+[dev-dependencies]
+cairo_test = "2.7.1"

exercises/practice/binary-search/Scarb.toml

@@ -1,4 +1,7 @@
 [package]
 name = "binary_search"
 version = "0.1.0"
-edition = "2023_11"
+edition = "2024_07"
+
+[dev-dependencies]
+cairo_test = "2.7.1"

exercises/practice/binary-search/src/lib.cairo

@@ -1,5 +1,5 @@
 pub fn find(search_array: @Array<usize>, value: usize) -> Option<usize> {
     // use the binary search algorithm to find the element '{value}' in the array '{search_array:?}'
-    // and return its index, otherwise return Option::None 
+    // and return its index, otherwise return Option::None
     panic!("implement `find`")
 }

exercises/practice/clock/.meta/example.cairo

@@ -24,7 +24,7 @@ fn double_digit(n: u32) -> ByteArray {
 #[generate_trait]
 pub impl ClockImpl of ClockTrait {
     fn new(hour: i32, minute: i32) -> Clock {
-        ClockImpl::build(hour * 60 + minute)
+        Self::build(hour * 60 + minute)
     }
 
     fn build(minutes: i32) -> Clock {
@@ -37,7 +37,7 @@ pub impl ClockImpl of ClockTrait {
     }
 
     fn add_minutes(ref self: Clock, minutes: i32) -> Clock {
-        ClockImpl::build(self.minutes.try_into().unwrap() + minutes)
+        Self::build(self.minutes.try_into().unwrap() + minutes)
     }
 
     fn to_string(self: @Clock) -> ByteArray {

exercises/practice/clock/Scarb.toml

@@ -1,4 +1,7 @@
 [package]
 name = "clock"
 version = "0.1.0"
-edition = "2023_11"
+edition = "2024_07"
+
+[dev-dependencies]
+cairo_test = "2.7.1"

exercises/practice/collatz-conjecture/Scarb.toml

@@ -1,4 +1,7 @@
 [package]
 name = "collatz_conjecture"
 version = "0.1.0"
-edition = "2023_11"
+edition = "2024_07"
+
+[dev-dependencies]
+cairo_test = "2.7.1"