Skip to content

Remove lazy_static dependency #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bernard-wagner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove lazy_static dependency #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ name = "api"
rand = { version = "0.8.3", default-features = false }
byteorder = { version = "1.0", features = ["i128"], default-features = false }
crunchy = "0.2.1"
lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
rustc-hex = { version = "2", default-features = false }

[dev-dependencies]
Expand Down
35 changes: 12 additions & 23 deletions src/fields/fp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ macro_rules! field_impl {
($name:ident, $modulus:expr, $rsquared:expr, $rcubed:expr, $one:expr, $inv:expr) => {
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
#[repr(C)]
pub struct $name(U256);
pub struct $name(pub U256);

impl From<$name> for U256 {
#[inline]
Expand Down Expand Up @@ -221,35 +221,24 @@ field_impl!(
0x9ede7d651eca6ac987d20782e4866389
);

lazy_static::lazy_static! {
const FQ: U256 = U256([
0x97816a916871ca8d3c208c16d87cfd47,
0x30644e72e131a029b85045b68181585d,
]);

static ref FQ: U256 = U256::from([
0x3c208c16d87cfd47,
0x97816a916871ca8d,
0xb85045b68181585d,
0x30644e72e131a029
]);

pub static ref FQ_MINUS3_DIV4: Fq =
Fq::new(3.into()).expect("3 is a valid field element and static; qed").neg() *
Fq::new(4.into()).expect("4 is a valid field element and static; qed").inverse()
.expect("4 has inverse in Fq and is static; qed");

static ref FQ_MINUS1_DIV2: Fq =
Fq::new(1.into()).expect("1 is a valid field element and static; qed").neg() *
Fq::new(2.into()).expect("2 is a valid field element and static; qed").inverse()
.expect("2 has inverse in Fq and is static; qed");

}
const FQ_MINUS3_DIV4: Fq = Fq(U256([
0x5e05aa45a1c72a34f082305b61f3f51c,
0x19139cb84c680a6e14116da06056176,
]));

impl Fq {
pub fn sqrt(&self) -> Option<Self> {
let a1 = self.pow(*FQ_MINUS3_DIV4);
let a1 = self.pow(FQ_MINUS3_DIV4);
let a1a = a1 * *self;
let a0 = a1 * (a1a);

let mut am1 = *FQ;
am1.sub(&1.into(), &*FQ);
let mut am1 = FQ;
am1.sub(&1.into(), &FQ);

if a0 == Fq::new(am1).unwrap() {
None
Expand Down
27 changes: 6 additions & 21 deletions src/fields/fq2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,35 +181,20 @@ impl Neg for Fq2 {
}
}

lazy_static::lazy_static! {
static ref FQ: U256 = U256::from([
0x3c208c16d87cfd47,
0x97816a916871ca8d,
0xb85045b68181585d,
0x30644e72e131a029
]);

static ref FQ_MINUS3_DIV4: Fq =
Fq::new(3.into()).expect("3 is a valid field element and static; qed").neg() *
Fq::new(4.into()).expect("4 is a valid field element and static; qed").inverse()
.expect("4 has inverse in Fq and is static; qed");

static ref FQ_MINUS1_DIV2: Fq =
Fq::new(1.into()).expect("1 is a valid field element and static; qed").neg() *
Fq::new(2.into()).expect("2 is a valid field element and static; qed").inverse()
.expect("2 has inverse in Fq and is static; qed");
}
const FQ: U256 = U256([0x97816a916871ca8d3c208c16d87cfd47, 0x30644e72e131a029b85045b68181585d]);
const FQ_MINUS3_DIV4: Fq = Fq(U256([0x5e05aa45a1c72a34f082305b61f3f51c, 0x019139cb84c680a6e14116da06056176]));
const FQ_MINUS1_DIV2: Fq = Fq(U256([0xc6843fb439555fa7b461a4448976f7d5, 0x112ceb58a394e07d28f0d12384840918]));

impl Fq2 {
pub fn i() -> Fq2 {
Fq2::new(Fq::zero(), Fq::one())
}

pub fn sqrt(&self) -> Option<Self> {
let a1 = self.pow::<U256>((*FQ_MINUS3_DIV4).into());
let a1 = self.pow::<U256>((FQ_MINUS3_DIV4).into());
let a1a = a1 * *self;
let alpha = a1 * a1a;
let a0 = alpha.pow(*FQ) * alpha;
let a0 = alpha.pow(FQ) * alpha;

if a0 == Fq2::one().neg() {
return None;
Expand All @@ -218,7 +203,7 @@ impl Fq2 {
if alpha == Fq2::one().neg() {
Some(Self::i() * a1a)
} else {
let b = (alpha + Fq2::one()).pow::<U256>((*FQ_MINUS1_DIV2).into());
let b = (alpha + Fq2::one()).pow::<U256>((FQ_MINUS1_DIV2).into());
Some(b * a1a)
}
}
Expand Down