ensure u32_backend feature works with r1cs

penumbra-zone · Jul 18, 2024 · 8421230 · 8421230
1 parent a170cc2
commit 8421230
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/src/fields/fp.rs b/src/fields/fp.rs
@@ -8,15 +8,14 @@ pub mod arkworks;
 mod ops;
 mod u32;
 
-// The u64 backend requires arkworks
-#[cfg(feature = "arkworks")]
+#[cfg(not(feature = "u32_backend"))]
 mod u64;
 
 cfg_if! {
-    if #[cfg(feature = "arkworks")] {
-        pub type Fp = u64::Fp;
-    } else {
+    if #[cfg(feature = "u32_backend")] {
         pub type Fp = u32::Fp;
+    } else {
+        pub type Fp = u64::Fp;
     }
 }
 

diff --git a/src/fields/fq.rs b/src/fields/fq.rs
@@ -8,15 +8,14 @@ pub mod arkworks;
 mod ops;
 mod u32;
 
-// The u64 backend requires arkworks
-#[cfg(feature = "arkworks")]
+#[cfg(not(feature = "u32_backend"))]
 mod u64;
 
 cfg_if! {
-    if #[cfg(feature = "arkworks")] {
-        pub type Fq = u64::Fq;
+    if #[cfg(feature = "u32_backend")] {
+        pub type Fp = u32::Fp;
     } else {
-        pub type Fq = u32::Fq;
+        pub type Fp = u64::Fp;
     }
 }
 

diff --git a/src/fields/fr.rs b/src/fields/fr.rs
@@ -8,15 +8,14 @@ pub mod arkworks;
 mod ops;
 pub mod u32;
 
-// The u64 backend requires arkworks
-#[cfg(feature = "arkworks")]
+#[cfg(not(feature = "u32_backend"))]
 pub mod u64;
 
 cfg_if! {
-    if #[cfg(feature = "arkworks")] {
-        pub type Fr = u64::Fr;
+    if #[cfg(feature = "u32_backend")] {
+        pub type Fp = u32::Fp;
     } else {
-        pub type Fr = u32::Fr;
+        pub type Fp = u64::Fp;
     }
 }