Skip to content

Commit ef03c86

Browse files
committed
Clean up warnings
Signed-off-by: Michael Lodder <redmike7@gmail.com>
1 parent 575641f commit ef03c86

File tree

5 files changed

+12
-21
lines changed

5 files changed

+12
-21
lines changed

src/constants.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub const NLEN: usize = curve_NLEN;
88
pub const BigNumBits: usize = BASEBITS;
99

1010
// Byte size of element in group G1, 1 extra byte for compression flag
11-
pub const GROUP_G1_SIZE: usize = (2 * MODBYTES + 1);
11+
pub const GROUP_G1_SIZE: usize = 2 * MODBYTES + 1;
1212

1313
lazy_static! {
1414
pub static ref GENERATOR_G1: GroupG1 = GroupG1::generator();
@@ -37,4 +37,4 @@ lazy_static! {
3737
}
3838

3939
#[cfg(any(feature = "bls381", feature = "bn254"))]
40-
pub use crate::types_g2::{GeneratorG2, GroupG2_SIZE, GroupGT_SIZE};
40+
pub use crate::types_g2::{GENERATOR_G2, GROUP_G2_SIZE, GROUP_GT_SIZE};

src/extension_field_gt.rs

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ use crate::group_elem_g2::{G2, parse_hex_as_FP2};
1010
use std::fmt;
1111
use std::hash::{Hash, Hasher};
1212
use crate::errors::SerzDeserzError;
13-
use crate::constants::GroupGT_SIZE;
13+
use crate::constants::GROUP_GT_SIZE;
1414

1515
use serde::de::{Deserialize, Deserializer, Error as DError, Visitor};
16-
use serde::ser::{Error as SError, Serialize, Serializer};
17-
use std::str::{FromStr, SplitWhitespace};
16+
use serde::ser::{Serialize, Serializer};
17+
use std::str::SplitWhitespace;
1818
use zeroize::Zeroize;
1919

2020
#[derive(Clone)]
@@ -29,13 +29,6 @@ impl fmt::Debug for GT {
2929
}
3030
}
3131

32-
impl fmt::Debug for GT {
33-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
34-
let mut c = self.value.clone();
35-
write!(f, "{}", c.tostring())
36-
}
37-
}
38-
3932
impl GT {
4033
pub fn new() -> Self {
4134
Self {
@@ -137,16 +130,16 @@ impl GT {
137130
pub fn to_bytes(&self) -> Vec<u8> {
138131
let mut temp = FP12::new();
139132
temp.copy(&self.value);
140-
let mut bytes: [u8; GroupGT_SIZE] = [0; GroupGT_SIZE];
133+
let mut bytes = [0u8; GROUP_GT_SIZE];
141134
temp.tobytes(&mut bytes);
142135
bytes.to_vec()
143136
}
144137

145138
pub fn from_bytes(bytes: &[u8]) -> Result<Self, SerzDeserzError> {
146-
if bytes.len() != GroupGT_SIZE {
139+
if bytes.len() != GROUP_GT_SIZE {
147140
return Err(SerzDeserzError::GTBytesIncorrectSize(
148141
bytes.len(),
149-
GroupGT_SIZE,
142+
GROUP_GT_SIZE,
150143
));
151144
}
152145
Ok(Self {
@@ -200,7 +193,7 @@ impl PartialEq for GT {
200193
}
201194
}
202195

203-
impl_group_elem_conversions!(GT, GroupGT, GroupGT_SIZE);
196+
impl_group_elem_conversions!(GT, GroupGT, GROUP_GT_SIZE);
204197

205198
impl_group_elem_traits!(GT, GroupGT);
206199

src/group_elem_g1.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ use std::slice::Iter;
1212

1313
use serde::de::{Deserialize, Deserializer, Error as DError, Visitor};
1414
use serde::ser::{Serialize, Serializer};
15-
use zeroize::Zeroize;
1615
use std::str::{FromStr, SplitWhitespace};
1716
use zeroize::Zeroize;
1817

src/types_g2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ use crate::constants::MODBYTES;
22

33
use super::types::GroupG2;
44
// Byte size of element in group G2
5-
pub const GROUP_G2_SIZE: usize = (4 * MODBYTES);
5+
pub const GROUP_G2_SIZE: usize = 4 * MODBYTES;
66

77
// Byte size of element in group GT
8-
pub const GroupGT_SIZE: usize = (12 * MODBYTES) as usize;
8+
pub const GROUP_GT_SIZE: usize = 12 * MODBYTES;
99

1010
lazy_static! {
1111
pub static ref GENERATOR_G2: GroupG2 = GroupG2::generator();

src/utils.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ use rand::prelude::*;
66
use crate::constants::{CURVE_ORDER, MODBYTES};
77
use crate::types::{BigNum, DoubleBigNum};
88

9-
use crate::errors::SerzDeserzError;
109
use sha3::digest::{ExtendableOutput, Input, XofReader};
11-
use sha3::{Digest, Sha3_256, Shake256};
10+
use sha3::Shake256;
1211

1312

1413
/// Generate a random number twice the number of bytes as the curve reduced by mod CURVE_ORDER

0 commit comments

Comments
 (0)