Skip to content

Commit

Permalink
Apply Tomek's test refactor suggestion
Browse files Browse the repository at this point in the history
  • Loading branch information
@ctoyan
ctoyan committed Apr 29, 2024
1 parent da82021 commit 8234f97
Show file tree
Hide file tree
Showing 2 changed files with 194 additions and 362 deletions.
202 changes: 65 additions & 137 deletions ampd/src/starknet/types/array_span.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ impl TryFrom<Vec<FieldElement>> for ArraySpan<u8> {
mod array_span_tests {
use std::str::FromStr;

use starknet_core::types::FieldElement;
use starknet_core::types::{FieldElement, FromStrError};

use crate::starknet::types::array_span::ArraySpan;

Expand All @@ -106,167 +106,95 @@ mod array_span_tests {
#[test]
fn try_from_failed_to_parse_element_to_u8() {
// the string "hello", but FieldElement is bigger than u8::max
let data = vec![
FieldElement::from_str(
"0x0000000000000000000000000000000000000000000000000000000000000005",
)
.unwrap(),
FieldElement::from_str(
"0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
)
.unwrap(),
FieldElement::from_str(
"0x0000000000000000000000000000000000000000000000000000000000000065",
)
.unwrap(),
FieldElement::from_str(
"0x000000000000000000000000000000000000000000000000000000000000006c",
)
.unwrap(),
FieldElement::from_str(
"0x000000000000000000000000000000000000000000000000000000000000006c",
)
.unwrap(),
FieldElement::from_str(
"0x000000000000000000000000000000000000000000000000000000000000006f",
)
.unwrap(),
];

let array_span = ArraySpan::<u8>::try_from(data);
let data: Result<Vec<FieldElement>, FromStrError> = vec![
"0x0000000000000000000000000000000000000000000000000000000000000005",
"0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
"0x0000000000000000000000000000000000000000000000000000000000000065",
"0x000000000000000000000000000000000000000000000000000000000000006c",
"0x000000000000000000000000000000000000000000000000000000000000006c",
"0x000000000000000000000000000000000000000000000000000000000000006f",
]
.into_iter()
.map(FieldElement::from_str)
.collect();

let array_span = ArraySpan::<u8>::try_from(data.unwrap());
assert!(array_span.is_err());
}

#[test]
fn try_from_failed_to_parse_elements_length_to_u32() {
// the string "hello", but element counte bigger than u32::max
let data = vec![
FieldElement::from_str(
"0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
)
.unwrap(),
FieldElement::from_str(
"0x0000000000000000000000000000000000000000000000000000000000000068",
)
.unwrap(),
FieldElement::from_str(
"0x0000000000000000000000000000000000000000000000000000000000000065",
)
.unwrap(),
FieldElement::from_str(
"0x000000000000000000000000000000000000000000000000000000000000006c",
)
.unwrap(),
FieldElement::from_str(
"0x000000000000000000000000000000000000000000000000000000000000006c",
)
.unwrap(),
FieldElement::from_str(
"0x000000000000000000000000000000000000000000000000000000000000006f",
)
.unwrap(),
];

let array_span = ArraySpan::<u8>::try_from(data);
let data: Result<Vec<FieldElement>, FromStrError> = vec![
"0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
"0x0000000000000000000000000000000000000000000000000000000000000068",
"0x0000000000000000000000000000000000000000000000000000000000000065",
"0x000000000000000000000000000000000000000000000000000000000000006c",
"0x000000000000000000000000000000000000000000000000000000000000006c",
"0x000000000000000000000000000000000000000000000000000000000000006f",
]
.into_iter()
.map(FieldElement::from_str)
.collect();

let array_span = ArraySpan::<u8>::try_from(data.unwrap());
assert!(array_span.is_err());
}

#[test]
fn try_from_invalid_number_of_elements() {
// the string "hello", but with only 4 bytes
let data = vec![
FieldElement::from_str(
"0x0000000000000000000000000000000000000000000000000000000000000005",
)
.unwrap(),
FieldElement::from_str(
"0x0000000000000000000000000000000000000000000000000000000000000068",
)
.unwrap(),
FieldElement::from_str(
"0x0000000000000000000000000000000000000000000000000000000000000065",
)
.unwrap(),
FieldElement::from_str(
"0x000000000000000000000000000000000000000000000000000000000000006c",
)
.unwrap(),
FieldElement::from_str(
"0x000000000000000000000000000000000000000000000000000000000000006c",
)
.unwrap(),
];

let array_span = ArraySpan::<u8>::try_from(data);
let data: Result<Vec<FieldElement>, FromStrError> = vec![
"0x0000000000000000000000000000000000000000000000000000000000000005",
"0x0000000000000000000000000000000000000000000000000000000000000068",
"0x0000000000000000000000000000000000000000000000000000000000000065",
"0x000000000000000000000000000000000000000000000000000000000000006c",
"0x000000000000000000000000000000000000000000000000000000000000006c",
]
.into_iter()
.map(FieldElement::from_str)
.collect();

let array_span = ArraySpan::<u8>::try_from(data.unwrap());
assert!(array_span.is_err());
}

#[test]
fn try_from_invalid_declared_length() {
// the string "hello", with correct number of bytes, but only 4 declared,
// instead of 5
let data = vec![
FieldElement::from_str(
"0x0000000000000000000000000000000000000000000000000000000000000004",
)
.unwrap(),
FieldElement::from_str(
"0x0000000000000000000000000000000000000000000000000000000000000068",
)
.unwrap(),
FieldElement::from_str(
"0x0000000000000000000000000000000000000000000000000000000000000065",
)
.unwrap(),
FieldElement::from_str(
"0x000000000000000000000000000000000000000000000000000000000000006c",
)
.unwrap(),
FieldElement::from_str(
"0x000000000000000000000000000000000000000000000000000000000000006c",
)
.unwrap(),
FieldElement::from_str(
"0x000000000000000000000000000000000000000000000000000000000000006f",
)
.unwrap(),
];

let array_span = ArraySpan::<u8>::try_from(data);
let data: Result<Vec<FieldElement>, FromStrError> = vec![
"0x0000000000000000000000000000000000000000000000000000000000000004",
"0x0000000000000000000000000000000000000000000000000000000000000068",
"0x0000000000000000000000000000000000000000000000000000000000000065",
"0x000000000000000000000000000000000000000000000000000000000000006c",
"0x000000000000000000000000000000000000000000000000000000000000006c",
"0x000000000000000000000000000000000000000000000000000000000000006f",
]
.into_iter()
.map(FieldElement::from_str)
.collect();

let array_span = ArraySpan::<u8>::try_from(data.unwrap());
assert!(array_span.is_err());
}

#[test]
fn try_from_valid() {
// the string "hello"
let data = vec![
FieldElement::from_str(
"0x0000000000000000000000000000000000000000000000000000000000000005",
)
.unwrap(),
FieldElement::from_str(
"0x0000000000000000000000000000000000000000000000000000000000000068",
)
.unwrap(),
FieldElement::from_str(
"0x0000000000000000000000000000000000000000000000000000000000000065",
)
.unwrap(),
FieldElement::from_str(
"0x000000000000000000000000000000000000000000000000000000000000006c",
)
.unwrap(),
FieldElement::from_str(
"0x000000000000000000000000000000000000000000000000000000000000006c",
)
.unwrap(),
FieldElement::from_str(
"0x000000000000000000000000000000000000000000000000000000000000006f",
)
.unwrap(),
];

let array_span = ArraySpan::<u8>::try_from(data).unwrap();
let data: Result<Vec<FieldElement>, FromStrError> = vec![
"0x0000000000000000000000000000000000000000000000000000000000000005",
"0x0000000000000000000000000000000000000000000000000000000000000068",
"0x0000000000000000000000000000000000000000000000000000000000000065",
"0x000000000000000000000000000000000000000000000000000000000000006c",
"0x000000000000000000000000000000000000000000000000000000000000006c",
"0x000000000000000000000000000000000000000000000000000000000000006f",
]
.into_iter()
.map(FieldElement::from_str)
.collect();

let array_span = ArraySpan::<u8>::try_from(data.unwrap()).unwrap();
assert_eq!(array_span.data, vec![104, 101, 108, 108, 111]);
}
}
Loading

0 comments on commit 8234f97

Please sign in to comment.