Fix for merge from main

akoshelev · Aug 19, 2024 · 403cf27 · 403cf27
1 parent 395c5db
commit 403cf27
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/ipa-core/src/protocol/ipa_prf/mod.rs b/ipa-core/src/protocol/ipa_prf/mod.rs
@@ -20,7 +20,7 @@ use crate::{
     protocol::{
         basics::{BooleanArrayMul, BooleanProtocols},
         context::{
-            Context, DZKPUpgraded, DZKPUpgradedSemiHonestContext, SemiHonestContext,
+            Context, DZKPUpgraded, DZKPUpgradedSemiHonestContext, MacUpgraded, SemiHonestContext,
             UpgradableContext, UpgradedSemiHonestContext,
         },
         ipa_prf::{
@@ -30,6 +30,7 @@ use crate::{
                 attribute_cap_aggregate, histograms_ranges_sortkeys, PrfShardedIpaInputRow,
             },
         },
+        prss::FromPrss,
         RecordId,
     },
     secret_sharing::{
@@ -301,7 +302,7 @@ where
     TS: BooleanArray,
     Replicated<Boolean, CONV_CHUNK>: BooleanProtocols<DZKPUpgraded<C>, CONV_CHUNK>,
     Replicated<Fp25519, PRF_CHUNK>:
-        PrfSharing<MacUpgraded<C>, PRF_CHUNK, Field = Fp25519> + FromPrss,
+        PrfSharing<MacUpgraded<C, Fp25519>, PRF_CHUNK, Field = Fp25519> + FromPrss,
 {
     let conv_records =
         TotalRecords::specified(div_round_up(input_rows.len(), Const::<CONV_CHUNK>))?;