allow serde by default

funkyweedz · Jun 23, 2022 · 0aa1189 · 0aa1189
1 parent 07480cf
commit 0aa1189
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,7 @@ rand = "0.4"
 bit-vec = "0.6"
 cfg-if = "1.*"
 
-pairing = {package = "pairing_ce", version = "0.26.*" }
+pairing = {package = "pairing_ce", version = "0.28.*" }
 # pairing = {package = "pairing_ce", path = "../pairing"}
 byteorder = "1"
 
@@ -38,6 +38,8 @@ blake2s_const = {version = "0.6", optional = true, path = "./src/plonk/blake2_co
 
 hex = "*"
 
+serde = {version = "1", features = ["derive"]}
+
 [features]
 default = ["multicore", "plonk"]
 multicore = ["crossbeam", "futures/thread-pool"]

diff --git a/src/plonk/transparent_engine/impl_macro.rs b/src/plonk/transparent_engine/impl_macro.rs
@@ -3,7 +3,7 @@ macro_rules! transparent_engine_impl {
         $engine:ident,
         $fr:ty
     ) => {
-        #[derive(Clone, Debug)]
+        #[derive(Clone, Copy, Debug)]
         pub struct $engine;
 
         impl crate::ff::ScalarEngine for $engine {

diff --git a/src/plonk/transparent_engine/proth.rs b/src/plonk/transparent_engine/proth.rs
@@ -1,10 +1,10 @@
 use crate::ff::*;
 use super::{PartialReductionField, PartialTwoBitReductionField};
 
-#[derive(Copy, Clone, PartialEq, Eq, Default, Hash)]
+#[derive(Copy, Clone, PartialEq, Eq, Default, Hash, ::serde::Serialize, ::serde::Deserialize)]
 pub struct FrRepr(pub [u64; 4usize]);
 
-#[derive(Hash)]
+#[derive(Hash, ::serde::Serialize, ::serde::Deserialize)]
 pub struct Fr(FrRepr);
 
 // const MODULUS: FrRepr = FrRepr([1u64, 0u64, 0u64, 576460752303423505u64]);

diff --git a/src/tests/dummy_engine.rs b/src/tests/dummy_engine.rs
@@ -24,7 +24,7 @@ use std::num::Wrapping;
 
 const MODULUS_R: Wrapping<u32> = Wrapping(64513);
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, ::serde::Serialize, ::serde::Deserialize)]
 pub struct Fr(Wrapping<u32>);
 
 impl fmt::Display for Fr {
@@ -160,7 +160,7 @@ impl SqrtField for Fr {
     }
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, ::serde::Serialize, ::serde::Deserialize)]
 pub struct FrRepr([u64; 1]);
 
 impl Ord for FrRepr {
@@ -300,7 +300,7 @@ impl PrimeField for Fr {
     }
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug)]
 pub struct DummyEngine;
 
 impl ScalarEngine for DummyEngine {