Some more fixes

benches/oneshot/ipa.rs

@@ -124,9 +124,9 @@ async fn run(args: Args) -> Result<(), Error> {
     .collect::<Vec<_>>();
 
     let order = if args.oprf {
-        CappingOrder::CapOldestFirst
-    } else {
         CappingOrder::CapMostRecentFirst
+    } else {
+        CappingOrder::CapOldestFirst
     };
     let expected_results = ipa_in_the_clear(
         &raw_data,

pre-commit

@@ -107,4 +107,3 @@ check "Arithmetic circuit benchmark" \
 
 check "Sort benchmark" \
     cargo bench --bench oneshot_sort --no-default-features --features="enable-benches descriptive-gate"
-

scripts/collect_steps.py

@@ -169,14 +169,15 @@ def ipa_steps(steps):
                     print(" ".join(args), file=sys.stderr)
                     steps.update(collect_steps(args))
 
+OPRF_BREAKDOWN_KEYS = [256]
 OPRF_USER_CAP = [16, 64, 128]
 OPRF_SECURITY_MODEL = ["semi-honest"]
-OPRF_TRIGGER_VALUE = [4]
+OPRF_TRIGGER_VALUE = [7]
 
 def oprf_steps(steps):
     for c in OPRF_USER_CAP:
         for w in ATTRIBUTION_WINDOW:
-            for b in BREAKDOWN_KEYS:
+            for b in OPRF_BREAKDOWN_KEYS:
                 for m in OPRF_SECURITY_MODEL:
                     for tv in OPRF_TRIGGER_VALUE:
                         args = ARGS + [
@@ -207,4 +208,3 @@ def oprf_steps(steps):
 
     for step in sorted_steps:
         print(step)
-

src/bin/report_collector.rs

@@ -26,7 +26,7 @@ use ipa::{
     protocol::{BreakdownKey, MatchKey},
     report::{KeyIdentifier, DEFAULT_KEY_ID},
     test_fixture::{
-        ipa::{ipa_in_the_clear, IpaSecurityModel, TestRawDataRecord},
+        ipa::{ipa_in_the_clear, CappingOrder, IpaSecurityModel, TestRawDataRecord},
         EventGenerator, EventGeneratorConfig,
     },
 };
@@ -247,7 +247,7 @@ async fn ipa(
             ipa_query_config.per_user_credit_cap,
             ipa_query_config.attribution_window_seconds,
             ipa_query_config.max_breakdown_key,
-            CappingOrder::CapOldestFirst,
+            &CappingOrder::CapOldestFirst,
         );
 
         // pad the output vector to the max breakdown key, to make sure it is aligned with the MPC results

src/test_fixture/input/sharing.rs

@@ -367,9 +367,14 @@ where
         } else {
             EventType::Source
         };
-        let timestamp = TS::truncate_from(self.timestamp).share_with(rng);
-        let breakdown_key = BK::truncate_from(self.breakdown_key).share_with(rng);
-        let trigger_value = TV::truncate_from(self.trigger_value).share_with(rng);
+        let timestamp: [Replicated<TS>; 3] =
+            TS::try_from(self.timestamp.into()).unwrap().share_with(rng);
+        let breakdown_key = BK::try_from(self.breakdown_key.into())
+            .unwrap()
+            .share_with(rng);
+        let trigger_value = TV::try_from(self.trigger_value.into())
+            .unwrap()
+            .share_with(rng);
 
         zip(zip(timestamp, breakdown_key), trigger_value)
             .map(|((ts_share, bk_share), tv_share)| OprfReport {

steps1.txt

@@ -0,0 +1 @@
+No steps in the output