Put arithmetic in its own folder

src/arithmetic.rs

@@ -0,0 +1,8 @@
+//! Contains modules for ring and matrix arithmetic
+
+mod matrix_arith;
+mod ring_arith;
+
+// Export all the underlying types
+pub(crate) use matrix_arith::*;
+pub(crate) use ring_arith::*;

src/matrix_arith.rs → src/arithmetic/matrix_arith.rs

@@ -1,6 +1,6 @@
 //! This file defines and implements matrices over our ring
 
-use crate::{consts::RING_DEG, ring_arith::RingElem};
+use crate::{arithmetic::RingElem, consts::RING_DEG};
 
 /// An element of R^{x×y} where R is a [`RingElem`], stored in row-major order
 // We store the matrix in row-major order, so the outer array is the number of rows, i.e., the

src/gen.rs

@@ -1,9 +1,8 @@
 //! This file implements methods for generating uniform matrices and binomially distributed vectors
 
 use crate::{
+    arithmetic::{Matrix, RingElem},
     consts::{MAX_MU, MODULUS_Q_BITS, RING_DEG},
-    matrix_arith::Matrix,
-    ring_arith::RingElem,
     ser::deserialize,
 };
 

src/lib.rs

@@ -9,13 +9,12 @@
 )]
 #![doc = include_str!("../README.md")]
 
+mod arithmetic;
 mod consts;
 mod gen;
 mod impls;
 mod kem;
-mod matrix_arith;
 mod pke;
-mod ring_arith;
 mod ser;
 
 pub extern crate kem as kem_traits;

src/pke.rs

@@ -1,12 +1,11 @@
 //! This file implements the IND-CPA-secure Saber.PKE scheme
 
 use crate::{
+    arithmetic::{Matrix, RingElem},
     consts::MAX_L,
     consts::MAX_MODULUS_T_BITS,
     consts::{MODULUS_P_BITS, MODULUS_Q_BITS, RING_DEG},
     gen::{gen_matrix_from_seed, gen_secret_from_seed},
-    matrix_arith::Matrix,
-    ring_arith::RingElem,
     ser::deserialize,
 };