Skip to content

Commit 3aac102

Browse files
schouhySergio Chouhy
andauthored
Fix from base type for FieldElement (#124)
* fix from &BaseType for FieldElement * change suggested by clippy --------- Co-authored-by: Sergio Chouhy <[email protected]>
1 parent 1296329 commit 3aac102

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

crypto/src/merkle_tree/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ mod tests {
106106
let hashed_leaves = complete_until_power_of_two(&mut values);
107107

108108
let mut expected_leaves = (1..6).map(FE::new).collect::<Vec<FE>>();
109-
expected_leaves.extend(&[FE::new(5); 3]);
109+
expected_leaves.extend([FE::new(5); 3]);
110110

111111
for (leaf, expected_leaves) in hashed_leaves.iter().zip(expected_leaves) {
112112
assert_eq!(*leaf, expected_leaves);

math/src/field/element.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ where
2020
{
2121
fn from(value: &F::BaseType) -> Self {
2222
Self {
23-
value: value.clone(),
23+
value: F::from_base_type(value.clone()),
2424
}
2525
}
2626
}

math/src/field/fields/u384_prime_field.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,13 @@ mod tests {
148148
type F23 = MontgomeryBackendPrimeField<MontgomeryConfig23>;
149149
type F23Element = FieldElement<F23>;
150150

151+
#[test]
152+
fn from_base_type_works() {
153+
let x = F23Element::from(&U384::from_u64(1));
154+
let expected_value = U384::from_u64(12);
155+
assert_eq!(x.value(), &expected_value);
156+
}
157+
151158
#[test]
152159
fn montgomery_backend_multiplication_works_0() {
153160
let x = F23Element::from(11_u64);

0 commit comments

Comments
 (0)