From 5821cb227c99521c93d2c1c39c1dabe7c5a157e3 Mon Sep 17 00:00:00 2001
From: Sebastian Ramacher <Sebastian.Ramacher@ait.ac.at>
Date: Mon, 18 Nov 2024 00:18:24 +0100
Subject: [PATCH] Remove NewFromU128

---
 src/aes.rs                 | 20 ++++++++++----------
 src/fields/large_fields.rs | 29 -----------------------------
 2 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/src/aes.rs b/src/aes.rs
index 341378e..e5ce6f3 100644
--- a/src/aes.rs
+++ b/src/aes.rs
@@ -712,7 +712,7 @@ mod test {
     use super::*;
 
     use crate::{
-        fields::{large_fields::NewFromU128, GF128, GF192, GF256},
+        fields::{GF128, GF192, GF256},
         parameter::{
             FAEST128sParameters, FAEST192sParameters, FAEST256sParameters, FAESTParameters,
             OWFParameters, OWF128, OWF192, OWF256,
@@ -853,6 +853,12 @@ mod test {
         res: Vec<u64>,
     }
 
+    impl AesVerify {
+        fn res_as_u8(&self) -> Vec<u8> {
+            self.res.iter().flat_map(|x| x.to_le_bytes()).collect()
+        }
+    }
+
     fn aes_verify<O, Tau>(
         d: &GenericArray<u8, O::LBYTES>,
         gq: &GenericArray<GenericArray<u8, O::LAMBDALBYTES>, O::LAMBDA>,
@@ -900,7 +906,7 @@ mod test {
                     GenericArray::from_slice(&data.output),
                 );
                 assert_eq!(
-                    GF128::new(data.res[0] as u128 + ((data.res[1] as u128) << 64), 0),
+                    GF128::from(data.res_as_u8().as_slice()),
                     GF128::from(&out[..])
                 );
             } else if data.lambda == 192 {
@@ -920,10 +926,7 @@ mod test {
                     GenericArray::from_slice(&data.output),
                 );
                 assert_eq!(
-                    GF192::new(
-                        data.res[0] as u128 + ((data.res[1] as u128) << 64),
-                        data.res[2] as u128
-                    ),
+                    GF192::from(data.res_as_u8().as_slice()),
                     GF192::from(&out[..])
                 );
             } else {
@@ -943,10 +946,7 @@ mod test {
                     GenericArray::from_slice(&data.output),
                 );
                 assert_eq!(
-                    GF256::new(
-                        data.res[0] as u128 + ((data.res[1] as u128) << 64),
-                        data.res[2] as u128 + ((data.res[3] as u128) << 64)
-                    ),
+                    GF256::from(data.res_as_u8().as_slice()),
                     GF256::from(&out[..])
                 );
             }
diff --git a/src/fields/large_fields.rs b/src/fields/large_fields.rs
index 581af9a..384e556 100644
--- a/src/fields/large_fields.rs
+++ b/src/fields/large_fields.rs
@@ -966,35 +966,6 @@ impl Distribution<GF256> for Standard {
     }
 }
 
-#[cfg(test)]
-/// Construct fields from `u128` representations
-///
-/// Only for tests!
-pub(crate) trait NewFromU128 {
-    fn new(first_value: u128, second_value: u128) -> Self;
-}
-
-#[cfg(test)]
-impl NewFromU128 for GF128 {
-    fn new(first_value: u128, _second_value: u128) -> Self {
-        Self([first_value])
-    }
-}
-
-#[cfg(test)]
-impl NewFromU128 for GF192 {
-    fn new(first_value: u128, second_value: u128) -> Self {
-        Self([first_value, second_value]).clear_high_bits()
-    }
-}
-
-#[cfg(test)]
-impl NewFromU128 for GF256 {
-    fn new(first_value: u128, second_value: u128) -> Self {
-        Self([first_value, second_value])
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;