cleanup/refactor fields

algebra-core/src/fields/mod.rs

@@ -13,6 +13,9 @@ use core::{
 
 use num_traits::{One, Zero};
 
+#[macro_use]
+pub mod arithmetic;
+
 #[macro_use]
 pub mod macros;
 pub mod models;

algebra-core/src/fields/models/mod.rs

@@ -1,17 +1,27 @@
-pub mod fp_256;
-pub use self::fp_256::*;
-
-pub mod fp_320;
-pub use self::fp_320::*;
-
-pub mod fp_384;
-pub use self::fp_384::*;
-
-pub mod fp_768;
-pub use self::fp_768::*;
-
-pub mod fp_832;
-pub use self::fp_832::*;
+use core::{
+    cmp::{Ord, Ordering, PartialOrd},
+    fmt::{Display, Formatter, Result as FmtResult},
+    marker::PhantomData,
+    ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign},
+    str::FromStr,
+};
+use num_traits::{One, Zero};
+use unroll::unroll_for_loops;
+
+use crate::{
+    biginteger::{arithmetic as fa, BigInteger as _BigInteger,
+        BigInteger256, BigInteger320, BigInteger384, BigInteger768, BigInteger832},
+    bytes::{FromBytes, ToBytes},
+    fields::{Field, FpParameters, LegendreSymbol, PrimeField, SquareRootField},
+    io::{Read, Result as IoResult, Write},
+    serialize::CanonicalDeserialize,
+};
+
+impl_Fp!(Fp256, Fp256Parameters, BigInteger256, BigInteger256, 4);
+impl_Fp!(Fp320, Fp320Parameters, BigInteger320, BigInteger320, 5);
+impl_Fp!(Fp384, Fp384Parameters, BigInteger384, BigInteger384, 6);
+impl_Fp!(Fp768, Fp768Parameters, BigInteger768, BigInteger768, 12);
+impl_Fp!(Fp832, Fp832Parameters, BigInteger832, BigInteger832, 13);
 
 pub mod fp2;
 pub use self::fp2::*;