Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes failure tests resulting in stack overflow error. #5

Merged
merged 1 commit into from
Nov 17, 2022
Merged

Fixes failure tests resulting in stack overflow error. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions ssz-rs/src/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use crate::ser::BYTES_PER_LENGTH_OFFSET;
use crate::SimpleSerialize;
use crate::std::{Vec, vec, Debug, Display, Formatter};

#[derive(Debug)]
pub enum DeserializeError {
InputTooShort,
ExtraInput,
Expand All @@ -11,15 +12,16 @@ pub enum DeserializeError {
IllegalType { bound: usize },
}

impl Debug for DeserializeError {
fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result {
write!(f, "{:?}", self)
}
}

impl Display for DeserializeError {
fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result {
write!(f, "{:?}", self)
match *self {
DeserializeError::InputTooShort => write!(f, "InputTooShort"),
DeserializeError::ExtraInput => write!(f, "ExtraInput"),
DeserializeError::InvalidInput => write!(f, "InvalidInput"),
DeserializeError::IOError => write!(f, "IOError"),
DeserializeError::TypeBoundsViolated { bound, len } => write!(f, "TypeBoundsViolated bound: {} len {}", bound, len),
DeserializeError::IllegalType { bound } => write!(f, "IllegalType bound: {}", bound),
}
}
}

Expand Down
2 changes: 0 additions & 2 deletions ssz-rs/tests/basic_vector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22175,7 +22175,6 @@ fn test_basic_vector_vec_uint32_3_zero() {
assert_eq!(root, expected_root);
}

/*
#[test]
#[should_panic]
fn test_basic_vector_vec_uint16_2_max_one_byte_less() {
Expand Down Expand Up @@ -30018,4 +30017,3 @@ fn test_basic_vector_vec_uint16_3_nil() {

deserialize::<Vector<u16, 3>>(&encoding);
}
*/
2 changes: 0 additions & 2 deletions ssz-rs/tests/bitlist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5507,7 +5507,6 @@ fn test_bitlist_bitlist_1_zero_4() {
assert_eq!(root, expected_root);
}

/*
#[test]
#[should_panic]
fn test_bitlist_bitlist_1_but_2() {
Expand Down Expand Up @@ -5647,4 +5646,3 @@ fn test_bitlist_bitlist_no_delimiter_zeroes() {

deserialize::<Bitlist<256>>(&encoding);
}
*/
2 changes: 0 additions & 2 deletions ssz-rs/tests/bitvector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,6 @@ fn test_bitvector_bitvec_8_max() {
assert_eq!(root, expected_root);
}

/*
#[test]
#[should_panic]
fn test_bitvector_bitvec_9_max_8() {
Expand Down Expand Up @@ -1109,4 +1108,3 @@ fn test_bitvector_bitvec_16_random_8() {

deserialize::<Bitvector<16>>(&encoding);
}
*/
3 changes: 1 addition & 2 deletions ssz-rs/tests/boolean.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ fn test_boolean_false() {
assert_eq!(root, expected_root);
}

/*
#[test]
#[should_panic]
fn test_boolean_byte_0x80() {
Expand Down Expand Up @@ -80,4 +79,4 @@ fn test_boolean_byte_rev_nibble() {
);

deserialize::<bool>(&encoding);
}*/
}
2 changes: 0 additions & 2 deletions ssz-rs/tests/containers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22202,7 +22202,6 @@ fn test_containers_bits_struct_one_chaos_2() {
assert_eq!(root, expected_root);
}

/*
#[test]
#[should_panic]
fn test_containers_bits_struct_offset_6_zeroed() {
Expand Down Expand Up @@ -22386,4 +22385,3 @@ fn test_containers_complex_test_struct_extra_byte() {

deserialize::<ComplexTestStruct>(&encoding);
}
*/
3 changes: 1 addition & 2 deletions ssz-rs/tests/uints.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1781,7 +1781,6 @@ fn test_uints_uint_64_last_byte_empty() {
assert_eq!(root, expected_root);
}

/*
#[test]
#[should_panic]
fn test_uints_uint_128_one_too_high() {
Expand Down Expand Up @@ -1960,4 +1959,4 @@ fn test_uints_uint_8_one_byte_shorter() {
);

deserialize::<u8>(&encoding);
}*/
}