From 06727934c33ae6b09ea5a1f8868901f10279848d Mon Sep 17 00:00:00 2001
From: Kevin Jue <kjue235@gmail.com>
Date: Mon, 15 May 2023 12:28:00 -0700
Subject: [PATCH] some minor changes

---
 Cargo.toml                    | 2 +-
 src/gadgets/arithmetic_u32.rs | 5 ++---
 src/gates/add_many_u32.rs     | 2 +-
 src/gates/range_check_u32.rs  | 6 +++---
 src/serialization.rs          | 1 +
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7a15d80..7cb7e48 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,5 +13,5 @@ num = { version = "0.4", default-features = false }
 plonky2 = { git = "https://github.com/mir-protocol/plonky2.git", default-features = false }
 
 [dev-dependencies]
-plonky2 = { git = "https://github.com/mir-protocol/plonky2.git", features = ["gate_testing"] }
+plonky2 = { git = "https://github.com/mir-protocol/plonky2.git", default-features = false, features = ["gate_testing"] }
 rand = { version = "0.8.4", default-features = false, features = ["getrandom"] }
diff --git a/src/gadgets/arithmetic_u32.rs b/src/gadgets/arithmetic_u32.rs
index 376d8f5..170352b 100644
--- a/src/gadgets/arithmetic_u32.rs
+++ b/src/gadgets/arithmetic_u32.rs
@@ -1,7 +1,7 @@
 use alloc::string::{String, ToString};
 use alloc::vec;
 use alloc::vec::Vec;
-use plonky2::util::serialization::{IoResult, Buffer, Read, Write};
+use plonky2::util::serialization::{Buffer, IoResult, Read, Write};
 use core::marker::PhantomData;
 
 use plonky2::field::extension::Extendable;
@@ -14,7 +14,7 @@ use plonky2::plonk::circuit_builder::CircuitBuilder;
 use crate::gates::add_many_u32::U32AddManyGate;
 use crate::gates::arithmetic_u32::U32ArithmeticGate;
 use crate::gates::subtraction_u32::U32SubtractionGate;
-use crate::serialization::{WriteU32, ReadU32};
+use crate::serialization::{ReadU32, WriteU32};
 use crate::witness::GeneratedValuesU32;
 
 #[derive(Clone, Copy, Debug)]
@@ -274,7 +274,6 @@ impl<F: RichField + Extendable<D>, const D: usize> SimpleGenerator<F>
         out_buffer.set_u32_target(self.low, low);
         out_buffer.set_u32_target(self.high, high);
     }
-
 }
 
 #[cfg(test)]
diff --git a/src/gates/add_many_u32.rs b/src/gates/add_many_u32.rs
index fc06677..26bc80e 100644
--- a/src/gates/add_many_u32.rs
+++ b/src/gates/add_many_u32.rs
@@ -1,7 +1,7 @@
 use alloc::format;
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
-use plonky2::util::serialization::{IoResult, Buffer, Write, Read};
+use plonky2::util::serialization::{Buffer, IoResult, Read, Write};
 use core::marker::PhantomData;
 
 use itertools::unfold;
diff --git a/src/gates/range_check_u32.rs b/src/gates/range_check_u32.rs
index 40b9630..1ca9457 100644
--- a/src/gates/range_check_u32.rs
+++ b/src/gates/range_check_u32.rs
@@ -216,13 +216,13 @@ impl<F: RichField + Extendable<D>, const D: usize> SimpleGenerator<F>
     }
 
     fn serialize(&self, dst: &mut Vec<u8>) -> IoResult<()> {
-        dst.write_usize(self.row)?;
-        self.gate.serialize(dst)
+        self.gate.serialize(dst)?;
+        dst.write_usize(self.row)
     }
 
     fn deserialize(src: &mut Buffer) -> IoResult<Self> {
-        let row = src.read_usize()?;
         let gate = U32RangeCheckGate::deserialize(src)?;
+        let row = src.read_usize()?;
         Ok(Self { row, gate })
     }
 
diff --git a/src/serialization.rs b/src/serialization.rs
index d64c6f8..3939d90 100644
--- a/src/serialization.rs
+++ b/src/serialization.rs
@@ -14,6 +14,7 @@ impl WriteU32 for Vec<u8> {
     }
 }
 
+#[cfg(feature = "std")]
 pub trait ReadU32 {
     fn read_target_u32(&mut self) -> IoResult<U32Target>;
 }