Skip to content

Commit

Permalink
♻️ Rename methods
Browse files Browse the repository at this point in the history
  • Loading branch information
taskooh committed May 9, 2024
1 parent 8594e84 commit bb2b597
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 30 deletions.
23 changes: 12 additions & 11 deletions mpc-algebra/examples/algebra.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ fn test_bitwise_lt() {
BigInteger256::from_bits_le(&b.iter().map(|x| x.reveal().is_one()).collect::<Vec<_>>());

let res_1 = a_bigint < b_bigint;
let res_2 = a.bitwise_lt(&b);
let res_2 = a.is_smaller_than_le(&b);

assert_eq!(res_1, res_2.reveal().is_one());
}
Expand All @@ -155,9 +155,10 @@ fn test_interval_test_half_modulus() {

let n = 10;
let timer = start_timer!(|| format!("interval_test_half_modulus test x {}", n));
// TODO: Test boundary conditions
for _ in 0..n {
let shared = MF::rand(rng);
let res = shared.interval_test_half_modulus();
let res = shared.is_smaller_or_equal_than_mod_minus_one_div_two();
assert_eq!(res.reveal(), if shared.reveal().into_repr() < half_modulus {F::one()} else {F::zero()});
}
end_timer!(timer);
Expand All @@ -172,7 +173,7 @@ fn test_less_than() {
let a = MF::rand(rng);
let b = MF::rand(rng);

let res = a.less_than(&b);
let res = a.is_smaller_than(&b);
if res.reveal().is_one() != (a.reveal() < b.reveal()) {
println!("a: {:?}, b: {:?}", a.reveal(), b.reveal());
println!("res: {:?}", res.reveal());
Expand All @@ -189,16 +190,16 @@ fn test_and() {
let a10 = vec![MF::one(), MF::zero()];
let a11 = vec![MF::one(), MF::one()];

assert_eq!(a00.unbounded_fan_in_and().reveal(), F::zero());
assert_eq!(a10.unbounded_fan_in_and().reveal(), F::zero());
assert_eq!(a11.unbounded_fan_in_and().reveal(), F::one());
assert_eq!(a00.kary_and().reveal(), F::zero());
assert_eq!(a10.kary_and().reveal(), F::zero());
assert_eq!(a11.kary_and().reveal(), F::one());

let mut counter = [0, 0];

for _ in 0..100 {
let a = (0..3).map(|_| MF::bit_rand(&mut rng)).collect::<Vec<_>>();

let res = a.unbounded_fan_in_and();
let res = a.kary_and();

println!("unbounded and is {:?}", res.reveal());
if res.reveal().is_zero() {
Expand All @@ -217,16 +218,16 @@ fn test_or() {
let a10 = vec![MF::one(), MF::zero()];
let a11 = vec![MF::one(), MF::one()];

assert_eq!(a00.unbounded_fan_in_or().reveal(), F::zero());
assert_eq!(a10.unbounded_fan_in_or().reveal(), F::one());
assert_eq!(a11.unbounded_fan_in_or().reveal(), F::one());
assert_eq!(a00.kary_or().reveal(), F::zero());
assert_eq!(a10.kary_or().reveal(), F::one());
assert_eq!(a11.kary_or().reveal(), F::one());

let mut counter = [0, 0];

for _ in 0..100 {
let a = (0..3).map(|_| MF::bit_rand(&mut rng)).collect::<Vec<_>>();

let res = a.unbounded_fan_in_or();
let res = a.kary_or();

// println!("unbounded or is {:?}", res.reveal());
if res.reveal().is_zero() {
Expand Down
10 changes: 5 additions & 5 deletions mpc-algebra/src/mpc_primitives.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ pub trait UniformBitRand: Sized {
pub trait BitwiseLessThan {
type Output;

fn bitwise_lt(&self, other: &Self) -> Self::Output;
fn is_smaller_than_le(&self, other: &Self) -> Self::Output;
}

pub trait LessThan : UniformBitRand {
type Output;

fn interval_test_half_modulus(&self) -> Self::Output;
fn less_than(&self, other: &Self) -> Self::Output;
fn is_smaller_or_equal_than_mod_minus_one_div_two(&self) -> Self::Output;
fn is_smaller_than(&self, other: &Self) -> Self::Output;
}

pub trait LogicalOperations {
type Output;

fn unbounded_fan_in_and(&self) -> Self::Output;
fn kary_and(&self) -> Self::Output;

fn unbounded_fan_in_or(&self) -> Self::Output;
fn kary_or(&self) -> Self::Output;
}

pub trait EqualityZero {
Expand Down
29 changes: 15 additions & 14 deletions mpc-algebra/src/wire/field.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ impl<F: PrimeField + SquareRootField, S: FieldShare<F>> UniformBitRand for MpcFi
.map(|_| Self::bit_rand(rng))
.collect::<Vec<_>>();

if bits.clone().bitwise_lt(&modulus_bits).reveal().is_one() {
if bits.clone().is_smaller_than_le(&modulus_bits).reveal().is_one() {
break bits;
}
};
Expand All @@ -268,7 +268,7 @@ impl<F: PrimeField + SquareRootField, S: FieldShare<F>> UniformBitRand for MpcFi
impl<F: PrimeField, S: FieldShare<F>> BitwiseLessThan for Vec<MpcField<F, S>> {
type Output = MpcField<F, S>;

fn bitwise_lt(&self, other: &Self) -> Self::Output {
fn is_smaller_than_le(&self, other: &Self) -> Self::Output {
let modulus_size = F::Params::MODULUS_BITS as usize;
assert_eq!(self.len(), modulus_size);
assert_eq!(other.len(), modulus_size);
Expand All @@ -284,7 +284,7 @@ impl<F: PrimeField, S: FieldShare<F>> BitwiseLessThan for Vec<MpcField<F, S>> {
// d_i = OR_{j=i}^{modulus_size-1} c_j
let mut d = vec![rev_c[0]];
for i in 0..modulus_size -1 {
d.push(vec![d[i],rev_c[i+1]].unbounded_fan_in_or());
d.push(vec![d[i],rev_c[i+1]].kary_or());
}
d.reverse();

Expand All @@ -306,7 +306,7 @@ impl<F: PrimeField, S: FieldShare<F>> BitwiseLessThan for Vec<MpcField<F, S>> {
impl<F: PrimeField + SquareRootField, S: FieldShare<F>> LessThan for MpcField<F,S> {
type Output = Self;
// check if shared value a is in the interval [0, modulus/2)
fn interval_test_half_modulus(&self) -> Self::Output {
fn is_smaller_or_equal_than_mod_minus_one_div_two(&self) -> Self::Output {
// define double self as x
let x = *self * Self::from_public(F::from(2u8));

Expand All @@ -326,7 +326,7 @@ impl<F: PrimeField + SquareRootField, S: FieldShare<F>> LessThan for MpcField<F,

// compute
// [lsb_x]_p = [c <B r]_p x (1-{lsb_c xor [lsb_r]_p}) + (1-[c <B r]_p) x {lsb_c xor [lsb_r]_p}
let c_lt_r = vec_c.bitwise_lt(&vec_r);
let c_lt_r = vec_c.is_smaller_than_le(&vec_r);
// TODO: implement xor?
let lsb_c_xor_lsb_r = lsb_c + lsb_r - Self::from_public(F::from(2u8)) * lsb_c * lsb_r;
let one = Self::one();
Expand All @@ -336,20 +336,21 @@ impl<F: PrimeField + SquareRootField, S: FieldShare<F>> LessThan for MpcField<F,
one - lsb_x
}

fn less_than(&self, other: &Self) -> Self::Output {
fn is_smaller_than(&self, other: &Self) -> Self::Output {
// [z]=[other−self<p/2],[x]=[self<p/2],[y]=[other>p/2]
// ([z]∧[x])∨([z]∧[y])∨(¬[z]∧[x]∧[y])=[z(x+y)+(1−2*z)xy].
let z = (*other-self).interval_test_half_modulus();
let x = self.interval_test_half_modulus();
let y = Self::one() - other.interval_test_half_modulus();
let z = (*other-self).is_smaller_or_equal_than_mod_minus_one_div_two();
let x = self.is_smaller_or_equal_than_mod_minus_one_div_two();
let y = Self::one() - other.is_smaller_or_equal_than_mod_minus_one_div_two();
z*(x+y)+(Self::one()-Self::from_public(F::from(2u8))*z)*x*y
}
}

impl<F: Field, S: FieldShare<F>> LogicalOperations for Vec<MpcField<F, S>> {
type Output = MpcField<F, S>;
// TODO: Implement kary_nand

fn unbounded_fan_in_and(&self) -> Self::Output {
fn kary_and(&self) -> Self::Output {
debug_assert!({
// each element is 0 or 1
self.iter()
Expand All @@ -358,12 +359,12 @@ impl<F: Field, S: FieldShare<F>> LogicalOperations for Vec<MpcField<F, S>> {
self.iter().fold(MpcField::<F, S>::one(), |acc, x| acc * x)
}

fn unbounded_fan_in_or(&self) -> Self::Output {
fn kary_or(&self) -> Self::Output {
let not_self = self
.iter()
.map(|x| MpcField::<F, S>::one() - x)
.collect::<Vec<_>>();
MpcField::<F, S>::one() - not_self.unbounded_fan_in_and()
MpcField::<F, S>::one() - not_self.kary_and()
}
}

Expand Down Expand Up @@ -681,7 +682,7 @@ impl<F: PrimeField + SquareRootField, S: FieldShare<F>> EqualityZero for MpcFiel
})
.collect::<Vec<_>>();

c_prime.unbounded_fan_in_and()
c_prime.kary_and()
}
};
res
Expand Down Expand Up @@ -721,7 +722,7 @@ impl<F: PrimeField + SquareRootField, S: FieldShare<F>> BitDecomposition for Mpc
.map(|b| Self::from_public(F::from(*b)))
.collect::<Vec<_>>();

let q = Self::one() - vec_r.bitwise_lt(&p_minus_c_field);
let q = Self::one() - vec_r.is_smaller_than_le(&p_minus_c_field);

// 4
let mut two_l = F::BigInt::from(1u64);
Expand Down

0 comments on commit bb2b597

Please sign in to comment.