fix linter warnings;

ergoplatform · May 27, 2020 · e044d67 · e044d67
1 parent 351e4f3
commit e044d67
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/sigma-ser/src/peekable_reader.rs b/sigma-ser/src/peekable_reader.rs
@@ -89,7 +89,7 @@ impl<R: Read> PeekableReader<R> {
 
 impl<R: Read> Read for PeekableReader<R> {
     fn read(&mut self, buf: &mut [u8]) -> Result<usize, Error> {
-        if buf.len() == 0 {
+        if buf.is_empty() {
             return Ok(0);
         }
 

diff --git a/sigma-ser/src/test_helpers.rs b/sigma-ser/src/test_helpers.rs
@@ -6,8 +6,7 @@ use std::io::Cursor;
 pub fn sigma_serialize_roundtrip<T: crate::serializer::SigmaSerializable>(v: &T) -> T {
     let mut data = Vec::new();
     v.sigma_serialize(&mut data).expect("serialization failed");
-    let mut bytes = data.clone();
-    let cursor = Cursor::new(&mut bytes[..]);
+    let cursor = Cursor::new(&mut data[..]);
     let mut reader = PeekableReader::new(cursor);
     T::sigma_parse(&mut reader).expect("parse failed")
 }
diff --git a/sigma-tree/src/data.rs b/sigma-tree/src/data.rs
@@ -6,12 +6,12 @@ use crate::{ecpoint::EcPoint, serialization::op_code::OpCode};
 #[derive(PartialEq, Eq, Debug)]
 pub enum SigmaBoolean {
     ProveDHTuple {
-        gv: EcPoint,
-        hv: EcPoint,
-        uv: EcPoint,
-        vv: EcPoint,
+        gv: Box<EcPoint>,
+        hv: Box<EcPoint>,
+        uv: Box<EcPoint>,
+        vv: Box<EcPoint>,
     },
-    ProveDlog(EcPoint),
+    ProveDlog(Box<EcPoint>),
     CAND(Vec<SigmaBoolean>),
 }
 
@@ -49,7 +49,7 @@ mod tests {
 
         fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
             (any::<EcPoint>())
-                .prop_map(|ecp| SigmaBoolean::ProveDlog(ecp))
+                .prop_map(|ecp| SigmaBoolean::ProveDlog(Box::new(ecp)))
                 .boxed()
         }
     }

diff --git a/sigma-tree/src/serialization/op_code.rs b/sigma-tree/src/serialization/op_code.rs
@@ -23,7 +23,7 @@ impl OpCode {
         OpCode(b)
     }
 
-    pub const fn value(&self) -> u8 {
+    pub const fn value(self) -> u8 {
         self.0
     }
 }

diff --git a/sigma-tree/src/serialization/sigmaboolean.rs b/sigma-tree/src/serialization/sigmaboolean.rs
@@ -21,7 +21,7 @@ impl SigmaSerializable for SigmaBoolean {
         match op_code {
             OpCode::PROVE_DLOG => {
                 let p = EcPoint::sigma_parse(r)?;
-                Ok(SigmaBoolean::ProveDlog(p))
+                Ok(SigmaBoolean::ProveDlog(Box::new(p)))
             }
             _ => todo!(),
         }