Merge pull request #869 from private-attribution/fix_collect_steps

Fixing error when running collect steps
private-attribution · Nov 30, 2023 · 1977afa · 1977afa
2 parents 9e9a663 + 71474ae
commit 1977afa
Show file tree

Hide file tree

Showing 7 changed files with 311 additions and 127 deletions.
diff --git a/ipa-core/benches/oneshot/ipa.rs b/ipa-core/benches/oneshot/ipa.rs
@@ -152,10 +152,6 @@ async fn run(args: Args) -> Result<(), Error> {
         CappingOrder::CapOldestFirst
     };
 
-    // TODO: Remove the below comment once #844 is landed.
-    // Note that how we apply the attribution window to IPA and OPRF IPA is different.
-    // For IPA, trigger events are considered within the window if [0..window] (upper bound inclusive).
-    // For OPRF, trigger events are considered within the window if [0..window) (upper bound exclusive).
     let expected_results = ipa_in_the_clear(
         &raw_data,
         args.per_user_cap,

diff --git a/ipa-core/src/ff/boolean_array.rs b/ipa-core/src/ff/boolean_array.rs
@@ -40,7 +40,7 @@ impl<'a> Iterator for BAIterator<'a> {
 
 //macro for implementing Boolean array, only works for a byte size for which Block is defined
 macro_rules! boolean_array_impl {
-    ($modname:ident, $name:ident, $bits:expr, $bytes:expr, $one:expr) => {
+    ($modname:ident, $name:ident, $bits:expr, $bytes:expr, [$($one:expr),+]) => {
         #[allow(clippy::suspicious_arithmetic_impl)]
         #[allow(clippy::suspicious_op_assign_impl)]
         mod $modname {
@@ -128,7 +128,7 @@ macro_rules! boolean_array_impl {
             }
 
             impl Field for $name {
-                const ONE: Self = Self($one);
+                const ONE: Self = Self(bitarr![const u8, Lsb0; $($one),+]);
 
                 fn as_u128(&self) -> u128 {
                     (*self).into()
@@ -307,49 +307,30 @@ store_impl!(U8, 64);
 store_impl!(U32, 256);
 
 //impl BA3
-boolean_array_impl!(
-    boolean_array_3,
-    BA3,
-    3,
-    1,
-    bitarr ! ( const u8, Lsb0;
-        1, 0, 0
-    )
-);
+boolean_array_impl!(boolean_array_3, BA3, 3, 1, [1, 0, 0]);
+
+//impl BA4
+boolean_array_impl!(boolean_array_4, BA4, 4, 1, [1, 0, 0, 0]);
 
 //impl BA5
-boolean_array_impl!(
-    boolean_array_5,
-    BA5,
-    5,
-    1,
-    bitarr ! ( const u8, Lsb0;
-        1, 0, 0, 0, 0
-    )
-);
+boolean_array_impl!(boolean_array_5, BA5, 5, 1, [1, 0, 0, 0, 0]);
+
+//impl BA6
+boolean_array_impl!(boolean_array_6, BA6, 6, 1, [1, 0, 0, 0, 0, 0]);
+
+//impl BA7
+boolean_array_impl!(boolean_array_7, BA7, 7, 1, [1, 0, 0, 0, 0, 0, 0]);
 
 //impl BA8
-boolean_array_impl!(
-    boolean_array_8,
-    BA8,
-    8,
-    1,
-    bitarr ! ( const u8, Lsb0;
-        1, 0, 0, 0, 0, 0, 0, 0
-    )
-);
+boolean_array_impl!(boolean_array_8, BA8, 8, 1, [1, 0, 0, 0, 0, 0, 0, 0]);
 
 //impl BA20
 boolean_array_impl!(
     boolean_array_20,
     BA20,
     20,
     3,
-    bitarr ! ( const u8, Lsb0;
-        1, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0
-    )
+    [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 );
 
 //impl BA32
@@ -358,11 +339,9 @@ boolean_array_impl!(
     BA32,
     32,
     4,
-    bitarr![const u8, Lsb0;
-        1, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0
+    [
+        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0
     ]
 );
 
@@ -372,15 +351,10 @@ boolean_array_impl!(
     BA64,
     64,
     8,
-    bitarr![const u8, Lsb0;
-        1, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0
+    [
+        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0
     ]
 );
 
@@ -391,38 +365,15 @@ boolean_array_impl!(
     BA256,
     256,
     32,
-    bitarr![const u8, Lsb0;
-        1, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0
+    [
+        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     ]
 );
diff --git a/ipa-core/src/protocol/ipa_prf/prf_sharding/mod.rs b/ipa-core/src/protocol/ipa_prf/prf_sharding/mod.rs
@@ -393,7 +393,7 @@ where
 /// Propagates errors from multiplications
 /// # Panics
 /// Propagates errors from multiplications
-pub async fn attribution_and_capping_and_aggregation<C, BK, TV, TS, SS, S, F>(
+pub async fn attribute_cap_aggregate<C, BK, TV, TS, SS, S, F>(
     sh_ctx: C,
     input_rows: Vec<PrfShardedIpaInputRow<BK, TV, TS>>,
     attribution_window_seconds: Option<NonZeroU32>,
@@ -823,7 +823,7 @@ pub mod tests {
             boolean_array::{BA20, BA3, BA5, BA8},
             CustomArray, Field, Fp32BitPrime,
         },
-        protocol::ipa_prf::prf_sharding::attribution_and_capping_and_aggregation,
+        protocol::ipa_prf::prf_sharding::attribute_cap_aggregate,
         rand::Rng,
         secret_sharing::{
             replicated::semi_honest::AdditiveShare as Replicated, IntoShares, WeakSharedValue,
@@ -1003,7 +1003,7 @@ pub mod tests {
 
             let result: Vec<_> = world
                 .semi_honest(records.into_iter(), |ctx, input_rows| async move {
-                    attribution_and_capping_and_aggregation::<
+                    attribute_cap_aggregate::<
                         _,
                         BA5,
                         BA3,
@@ -1057,7 +1057,7 @@ pub mod tests {
 
             let result: Vec<_> = world
                 .semi_honest(records.into_iter(), |ctx, input_rows| async move {
-                    attribution_and_capping_and_aggregation::<
+                    attribute_cap_aggregate::<
                         _,
                         BA5,
                         BA3,
@@ -1150,7 +1150,7 @@ pub mod tests {
 
             let result: Vec<_> = world
                 .semi_honest(records.into_iter(), |ctx, input_rows| async move {
-                    attribution_and_capping_and_aggregation::<
+                    attribute_cap_aggregate::<
                         _,
                         BA8,
                         BA3,