zecfoundation
/
libbolt
mirror of https://github.com/ZcashFoundation/libbolt.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

i64: fix power in i128

This commit is contained in:
Gijs Van Laer 2019-09-27 16:40:00 -04:00
parent 7da80c9e8e
commit cdb78f3c7c
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ccs08.rs
View File

@ -234,7 +234,7 @@ impl<E: Engine> ParamsUL<E> {
} }
pub fn prove_ul_commitment<R: Rng>(&self, rng: &mut R, x: i64, k: usize, sOptional: Option<Vec<E::Fr>>, mOptional: Option<E::Fr>) -> ProofULState<E> { pub fn prove_ul_commitment<R: Rng>(&self, rng: &mut R, x: i64, k: usize, sOptional: Option<Vec<E::Fr>>, mOptional: Option<E::Fr>) -> ProofULState<E> {
if x > self.u.pow(self.l as u32) - 1 || x < 0 { if x > ((self.u as i128).pow(self.l as u32) - 1) as i64 || x < 0 {
panic!("x is not within the range."); panic!("x is not within the range.");
} }
let decx = decompose(x, self.u, self.l); let decx = decompose(x, self.u, self.l);

50
src/nizk.rs
View File

@ -228,13 +228,13 @@ mod tests {
let pkc = Fr::rand(rng); let pkc = Fr::rand(rng);
let wpk = Fr::rand(rng); let wpk = Fr::rand(rng);
let wpkprime = Fr::rand(rng); let wpkprime = Fr::rand(rng);
let bc = rng.gen_range(100, 1000) as i64; let bc = rng.gen_range(100, 1000);
let mut bc2 = bc.clone(); let mut bc2 = bc.clone();
let bm = rng.gen_range(100, 1000) as i64; let bm = rng.gen_range(100, 1000);
let mut bm2 = bm.clone(); let mut bm2 = bm.clone();
let epsilon = rng.gen_range(1, 100) as i64; let epsilon = rng.gen_range(1, 100);
bc2 = (bc2 as i64 - epsilon) as i64; bc2 -= epsilon;
bm2 = (bm2 as i64 + epsilon) as i64; bm2 += epsilon;
let r = Fr::rand(rng); let r = Fr::rand(rng);
let rprime = Fr::rand(rng); let rprime = Fr::rand(rng);
@ -258,13 +258,13 @@ mod tests {
let pkc = Fr::rand(rng); let pkc = Fr::rand(rng);
let wpk = Fr::rand(rng); let wpk = Fr::rand(rng);
let wpkprime = Fr::rand(rng); let wpkprime = Fr::rand(rng);
let bc = rng.gen_range(100, 1000) as i64; let bc = rng.gen_range(100, 1000);
let mut bc2 = bc.clone(); let mut bc2 = bc.clone();
let bm = rng.gen_range(100, 1000) as i64; let bm = rng.gen_range(100, 1000);
let mut bm2 = bm.clone(); let mut bm2 = bm.clone();
let epsilon = rng.gen_range(-100, -1) as i64; let epsilon = rng.gen_range(-100, -1);
bc2 = (bc2 as i64 - epsilon) as i64; bc2 -= epsilon;
bm2 = (bm2 as i64 + epsilon) as i64; bm2 += epsilon;
let r = Fr::rand(rng); let r = Fr::rand(rng);
let rprime = Fr::rand(rng); let rprime = Fr::rand(rng);
@ -288,13 +288,13 @@ mod tests {
let pkc = Fr::rand(rng); let pkc = Fr::rand(rng);
let wpk = Fr::rand(rng); let wpk = Fr::rand(rng);
let wpkprime = Fr::rand(rng); let wpkprime = Fr::rand(rng);
let bc = rng.gen_range(100, 1000) as i64; let bc = rng.gen_range(100, 1000);
let mut bc2 = bc.clone(); let mut bc2 = bc.clone();
let bm = rng.gen_range(100, 1000) as i64; let bm = rng.gen_range(100, 1000);
let mut bm2 = bm.clone(); let mut bm2 = bm.clone();
let epsilon = rng.gen_range(1, 100) as i64; let epsilon = rng.gen_range(1, 100);
bc2 = (bc2 as i64 - epsilon) as i64; bc2 -= epsilon;
bm2 = (bm2 as i64 + epsilon) as i64; bm2 += epsilon;
let r = Fr::rand(rng); let r = Fr::rand(rng);
let rprime = Fr::rand(rng); let rprime = Fr::rand(rng);
@ -329,13 +329,13 @@ mod tests {
let pkc = Fr::rand(rng); let pkc = Fr::rand(rng);
let wpk = Fr::rand(rng); let wpk = Fr::rand(rng);
let wpkprime = Fr::rand(rng); let wpkprime = Fr::rand(rng);
let bc = rng.gen_range(100, 1000) as i64; let bc = rng.gen_range(100, 1000);
let mut bc2 = bc.clone(); let mut bc2 = bc.clone();
let bm = rng.gen_range(100, 1000) as i64; let bm = rng.gen_range(100, 1000);
let mut bm2 = bm.clone(); let mut bm2 = bm.clone();
let epsilon = rng.gen_range(1, 100) as i64; let epsilon = rng.gen_range(1, 100);
bc2 = (bc2 as i64 - epsilon) as i64; bc2 -= epsilon;
bm2 = (bm2 as i64 + epsilon) as i64; bm2 += epsilon;
let r = Fr::rand(rng); let r = Fr::rand(rng);
let rprime = Fr::rand(rng); let rprime = Fr::rand(rng);
@ -370,8 +370,8 @@ mod tests {
let wpk = Fr::rand(rng); let wpk = Fr::rand(rng);
let t = Fr::rand(rng); let t = Fr::rand(rng);
let bc = rng.gen_range(100, 1000) as i64; let bc = rng.gen_range(100, 1000);
let bm = rng.gen_range(100, 1000) as i64; let bm = rng.gen_range(100, 1000);
let wallet = Wallet::<Bls12> { pkc: pkc, wpk: wpk, bc: bc, bm: bm, close: None }; let wallet = Wallet::<Bls12> { pkc: pkc, wpk: wpk, bc: bc, bm: bm, close: None };
let secParams = NIZKSecretParams::<Bls12>::setup(rng, 4); let secParams = NIZKSecretParams::<Bls12>::setup(rng, 4);
@ -390,9 +390,9 @@ mod tests {
let wpk = Fr::rand(rng); let wpk = Fr::rand(rng);
let t = Fr::rand(rng); let t = Fr::rand(rng);
let bc = rng.gen_range(100, 1000) as i64; let bc = rng.gen_range(100, 1000);
let bc2 = rng.gen_range(100, 1000) as i64; let bc2 = rng.gen_range(100, 1000);
let bm = rng.gen_range(100, 1000) as i64; let bm = rng.gen_range(100, 1000);
let wallet1 = Wallet::<Bls12> { pkc: pkc, wpk: wpk, bc: bc, bm: bm, close: None }; let wallet1 = Wallet::<Bls12> { pkc: pkc, wpk: wpk, bc: bc, bm: bm, close: None };
let wallet2 = Wallet::<Bls12> { pkc: pkc, wpk: wpk, bc: bc2, bm: bm, close: None }; let wallet2 = Wallet::<Bls12> { pkc: pkc, wpk: wpk, bc: bc2, bm: bm, close: None };