Move ComplaintResponse into avss; drop unused generic parameter

Author: jonas-lj

fastcrypto-tbls/src/threshold_schnorr/avss.rs

@@ -14,7 +14,7 @@ use crate::nodes::{Nodes, PartyId};
 use crate::polynomial::{Eval, Poly};
 use crate::random_oracle::RandomOracle;
 use crate::threshold_schnorr::bcs::BCSSerialized;
-use crate::threshold_schnorr::complaint::{ComplaintResponse, RecoveryProof};
+use crate::threshold_schnorr::complaint::RecoveryProof;
 use crate::threshold_schnorr::Extensions::Encryption;
 use crate::threshold_schnorr::{random_oracle_from_sid, EG, G, S};
 use crate::types;
@@ -71,6 +71,14 @@ pub struct Complaint {
     pub proof: RecoveryProof,
 }
 
+/// A response to a [Complaint], containing the responder's shares so the accuser can
+/// Lagrange-interpolate their own.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ComplaintResponse {
+    pub responder_id: PartyId,
+    pub shares: SharesForNode,
+}
+
 /// The output of a receiver after a single instance of AVSS: The shares for each nonce + commitments for the next round.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct PartialOutput {
@@ -311,7 +319,7 @@ impl Receiver {
         message: &Message,
         complaint: &Complaint,
         my_output: &PartialOutput,
-    ) -> FastCryptoResult<ComplaintResponse<SharesForNode>> {
+    ) -> FastCryptoResult<ComplaintResponse> {
         complaint.proof.check(
             complaint.accuser_id,
             &self.nodes.node_id_to_node(complaint.accuser_id)?.pk,
@@ -333,7 +341,7 @@ impl Receiver {
     pub fn recover(
         &self,
         message: &Message,
-        responses: Vec<ComplaintResponse<SharesForNode>>,
+        responses: Vec<ComplaintResponse>,
     ) -> FastCryptoResult<PartialOutput> {
         // Sanity check that we have enough responses (by weight) to recover the shares.
         let total_response_weight = self

fastcrypto-tbls/src/threshold_schnorr/complaint.rs

@@ -80,19 +80,3 @@ impl RecoveryProof {
         ))
     }
 }
-
-/// A response to a complaint, containing the responder's shares.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ComplaintResponse<S> {
-    pub(crate) responder_id: PartyId,
-    pub(crate) shares: S,
-}
-
-impl<S> ComplaintResponse<S> {
-    pub fn new(responder_id: PartyId, shares: S) -> Self {
-        Self {
-            responder_id,
-            shares,
-        }
-    }
-}