From fce64eaced12814d6deed8d0571e1fbf1b3b02d9 Mon Sep 17 00:00:00 2001 From: MSGhais Date: Sat, 22 Feb 2025 16:54:55 +0700 Subject: [PATCH] fix store vec and test to fix build and use --- .tool-versions | 1 + Scarb.toml | 1 + src/f128/math/ops.cairo | 71 +++++++++++++++++++------------------- src/f128/types/vec2.cairo | 4 +-- src/f128/types/vec3.cairo | 3 +- src/f128/types/vec4.cairo | 3 +- src/f64/math/ops.cairo | 72 +++++++++++++++++++-------------------- src/f64/types/vec2.cairo | 2 +- src/f64/types/vec3.cairo | 2 +- src/f64/types/vec4.cairo | 2 +- 10 files changed, 82 insertions(+), 79 deletions(-) create mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..3efd1f4 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +scarb 2.9.1 diff --git a/Scarb.toml b/Scarb.toml index 8321422..0446d45 100644 --- a/Scarb.toml +++ b/Scarb.toml @@ -11,3 +11,4 @@ sierra = false # Enable Sierra codegen. casm = false # Enable CASM codegen. [dependencies] +starknet = ">=2.8.2" diff --git a/src/f128/math/ops.cairo b/src/f128/math/ops.cairo index fd39913..74c7655 100644 --- a/src/f128/math/ops.cairo +++ b/src/f128/math/ops.cairo @@ -576,17 +576,17 @@ mod tests { let b = FixedTrait::from_unscaled_felt(0); let c = FixedTrait::from_unscaled_felt(-1); - assert(a <= a, 'a <= a'); - assert(a <= b == false, 'a <= b'); - assert(a <= c == false, 'a <= c'); + assert((a <= a) == true, 'a <= a'); + assert((a <= b) == false, 'a <= b'); + assert((a <= c) == false, 'a <= c'); - assert(b <= a, 'b <= a'); - assert(b <= b, 'b <= b'); - assert(b <= c == false, 'b <= c'); + assert((b <= a) == false, 'b <= a'); + assert((b <= b) == true, 'b <= b'); + assert((b <= c) == false, 'b <= c'); - assert(c <= a, 'c <= a'); - assert(c <= b, 'c <= b'); - assert(c <= c, 'c <= c'); + assert((c <= a) == false, 'c <= a'); + assert((c <= b) == false, 'c <= b'); + assert((c <= c) == true, 'c <= c'); } #[test] @@ -595,17 +595,16 @@ mod tests { let b = FixedTrait::from_unscaled_felt(0); let c = FixedTrait::from_unscaled_felt(-1); - assert(a < a == false, 'a < a'); - assert(a < b == false, 'a < b'); - assert(a < c == false, 'a < c'); + assert((a < a) == false, 'a < a'); + assert((a < c) == false, 'a < c'); - assert(b < a, 'b < a'); - assert(b < b == false, 'b < b'); - assert(b < c == false, 'b < c'); + assert((b < a) == false, 'b < a'); + assert((b < b) == false, 'b < b'); + assert((b < c) == false, 'b < c'); - assert(c < a, 'c < a'); - assert(c < b, 'c < b'); - assert(c < c == false, 'c < c'); + assert((c < a) == false, 'c < a'); + assert((c < b) == false, 'c < b'); + assert((c < c) == false, 'c < c'); } #[test] @@ -614,17 +613,17 @@ mod tests { let b = FixedTrait::from_unscaled_felt(0); let c = FixedTrait::from_unscaled_felt(-1); - assert(a >= a, 'a >= a'); - assert(a >= b, 'a >= b'); - assert(a >= c, 'a >= c'); + assert((a >= a) == true, 'a >= a'); + assert((a >= b) == true, 'a >= b'); + assert((a >= c) == true, 'a >= c'); - assert(b >= a == false, 'b >= a'); - assert(b >= b, 'b >= b'); - assert(b >= c, 'b >= c'); + assert((b >= a) == false, 'b >= a'); + assert((b >= b) == true, 'b >= b'); + assert((b >= c) == true, 'b >= c'); - assert(c >= a == false, 'c >= a'); - assert(c >= b == false, 'c >= b'); - assert(c >= c, 'c >= c'); + assert((c >= a) == false, 'c >= a'); + assert((c >= b) == false, 'c >= b'); + assert((c >= c) == true, 'c >= c'); } #[test] @@ -633,17 +632,17 @@ mod tests { let b = FixedTrait::from_unscaled_felt(0); let c = FixedTrait::from_unscaled_felt(-1); - assert(a > a == false, 'a > a'); - assert(a > b, 'a > b'); - assert(a > c, 'a > c'); + assert((a > a) == false, 'a > a'); + assert((a > b) == false, 'a > b'); + assert((a > c) == false, 'a > c'); - assert(b > a == false, 'b > a'); - assert(b > b == false, 'b > b'); - assert(b > c, 'b > c'); + assert((b > a) == false, 'b > a'); + assert((b > b) == false, 'b > b'); + assert((b > c) == false, 'b > c'); - assert(c > a == false, 'c > a'); - assert(c > b == false, 'c > b'); - assert(c > c == false, 'c > c'); + assert((c > a) == false, 'c > a'); + assert((c > b) == false, 'c > b'); + assert((c > c) == false, 'c > c'); } #[test] diff --git a/src/f128/types/vec2.cairo b/src/f128/types/vec2.cairo index c6892c2..d044d46 100644 --- a/src/f128/types/vec2.cairo +++ b/src/f128/types/vec2.cairo @@ -1,8 +1,8 @@ use core::debug::PrintTrait; - +use starknet::Store; use cubit::f128::types::fixed::{Fixed, FixedTrait, FixedPrint}; -#[derive(Copy, Drop, Serde, Store)] +#[derive(Copy, Drop, Serde, starknet::Store)] struct Vec2 { x: Fixed, y: Fixed diff --git a/src/f128/types/vec3.cairo b/src/f128/types/vec3.cairo index 8b1e646..d2675f1 100644 --- a/src/f128/types/vec3.cairo +++ b/src/f128/types/vec3.cairo @@ -1,8 +1,9 @@ use core::debug::PrintTrait; +use starknet::{Store}; use cubit::f128::types::fixed::{Fixed, FixedTrait, FixedPrint}; -#[derive(Copy, Drop, Serde, Store)] +#[derive(Copy, Drop, Serde, starknet::Store)] struct Vec3 { x: Fixed, y: Fixed, diff --git a/src/f128/types/vec4.cairo b/src/f128/types/vec4.cairo index 2986a1e..d82ebac 100644 --- a/src/f128/types/vec4.cairo +++ b/src/f128/types/vec4.cairo @@ -1,8 +1,9 @@ use core::debug::PrintTrait; +use starknet::Store; use cubit::f128::types::fixed::{Fixed, FixedTrait, FixedPrint}; -#[derive(Copy, Drop, Serde, Store)] +#[derive(Copy, Drop, Serde, starknet::Store)] struct Vec4 { x: Fixed, y: Fixed, diff --git a/src/f64/math/ops.cairo b/src/f64/math/ops.cairo index 48dce5d..d32a3bc 100644 --- a/src/f64/math/ops.cairo +++ b/src/f64/math/ops.cairo @@ -538,17 +538,17 @@ mod tests { let b = FixedTrait::new_unscaled(0, false); let c = FixedTrait::new_unscaled(1, true); - assert(a <= a, 'a <= a'); - assert(a <= b == false, 'a <= b'); - assert(a <= c == false, 'a <= c'); + assert((a <= a) == true, 'a <= a'); + assert((a <= b) == false, 'a <= b'); + assert((a <= c) == false, 'a <= c'); - assert(b <= a, 'b <= a'); - assert(b <= b, 'b <= b'); - assert(b <= c == false, 'b <= c'); + assert((b <= a) == false, 'b <= a'); + assert((b <= b) == true, 'b <= b'); + assert((b <= c) == false, 'b <= c'); - assert(c <= a, 'c <= a'); - assert(c <= b, 'c <= b'); - assert(c <= c, 'c <= c'); + assert((c <= a) == false, 'c <= a'); + assert((c <= b) == false, 'c <= b'); + assert((c <= c) == true, 'c <= c'); } #[test] @@ -557,17 +557,17 @@ mod tests { let b = FixedTrait::new_unscaled(0, false); let c = FixedTrait::new_unscaled(1, true); - assert(a < a == false, 'a < a'); - assert(a < b == false, 'a < b'); - assert(a < c == false, 'a < c'); + assert((a < a) == false, 'a < a'); + assert((a < b) == false, 'a < b'); + assert((a < c) == false, 'a < c'); - assert(b < a, 'b < a'); - assert(b < b == false, 'b < b'); - assert(b < c == false, 'b < c'); + assert((b < a) == false, 'b < a'); + assert((b < b) == false, 'b < b'); + assert((b < c) == false, 'b < c'); - assert(c < a, 'c < a'); - assert(c < b, 'c < b'); - assert(c < c == false, 'c < c'); + assert((c < a) == false, 'c < a'); + assert((c < b) == false, 'c < b'); + assert((c < c) == false, 'c < c'); } #[test] @@ -576,17 +576,17 @@ mod tests { let b = FixedTrait::new_unscaled(0, false); let c = FixedTrait::new_unscaled(1, true); - assert(a >= a, 'a >= a'); - assert(a >= b, 'a >= b'); - assert(a >= c, 'a >= c'); + assert((a >= a) == true, 'a >= a'); + assert((a >= b) == false, 'a >= b'); + assert((a >= c) == false, 'a >= c'); - assert(b >= a == false, 'b >= a'); - assert(b >= b, 'b >= b'); - assert(b >= c, 'b >= c'); + assert((b >= a) == false, 'b >= a'); + assert((b >= b) == true, 'b >= b'); + assert((b >= c) == false, 'b >= c'); - assert(c >= a == false, 'c >= a'); - assert(c >= b == false, 'c >= b'); - assert(c >= c, 'c >= c'); + assert((c >= a) == false, 'c >= a'); + assert((c >= b) == false, 'c >= b'); + assert((c >= c) == true, 'c >= c'); } #[test] @@ -595,17 +595,17 @@ mod tests { let b = FixedTrait::new_unscaled(0, false); let c = FixedTrait::new_unscaled(1, true); - assert(a > a == false, 'a > a'); - assert(a > b, 'a > b'); - assert(a > c, 'a > c'); + assert((a > a) == false, 'a > a'); + assert((a > b) == false, 'a > b'); + assert((a > c) == false, 'a > c'); - assert(b > a == false, 'b > a'); - assert(b > b == false, 'b > b'); - assert(b > c, 'b > c'); + assert((b > a) == false, 'b > a'); + assert((b > b) == false, 'b > b'); + assert((b > c) == false, 'b > c'); - assert(c > a == false, 'c > a'); - assert(c > b == false, 'c > b'); - assert(c > c == false, 'c > c'); + assert((c > a) == false, 'c > a'); + assert((c > b) == false, 'c > b'); + assert((c > c) == false, 'c > c'); } #[test] diff --git a/src/f64/types/vec2.cairo b/src/f64/types/vec2.cairo index 02fbfd2..0b2ec87 100644 --- a/src/f64/types/vec2.cairo +++ b/src/f64/types/vec2.cairo @@ -2,7 +2,7 @@ use core::debug::PrintTrait; use cubit::f64::types::fixed::{Fixed, FixedTrait, FixedPrint}; -#[derive(Copy, Drop, Serde, Store)] +#[derive(Copy, Drop, Serde, starknet::Store)] struct Vec2 { x: Fixed, y: Fixed diff --git a/src/f64/types/vec3.cairo b/src/f64/types/vec3.cairo index ff4652e..291675c 100644 --- a/src/f64/types/vec3.cairo +++ b/src/f64/types/vec3.cairo @@ -2,7 +2,7 @@ use core::debug::PrintTrait; use cubit::f64::types::fixed::{Fixed, FixedTrait, FixedPrint}; -#[derive(Copy, Drop, Serde, Store)] +#[derive(Copy, Drop, Serde, starknet::Store)] struct Vec3 { x: Fixed, y: Fixed, diff --git a/src/f64/types/vec4.cairo b/src/f64/types/vec4.cairo index f618027..f8c3ffe 100644 --- a/src/f64/types/vec4.cairo +++ b/src/f64/types/vec4.cairo @@ -2,7 +2,7 @@ use core::debug::PrintTrait; use cubit::f64::types::fixed::{Fixed, FixedTrait, FixedPrint}; -#[derive(Copy, Drop, Serde, Store)] +#[derive(Copy, Drop, Serde, starknet::Store)] struct Vec4 { x: Fixed, y: Fixed,