reference: Get rid of pre_prefinalize terminology

Author: real-or-random

reference/chilldkg.py

@@ -187,7 +187,7 @@ def participant_step2(
     (params, idx, enc_state) = state1
     enc_cmsg, enc_shares_sums = cmsg
 
-    dkg_output, eq_input = encpedpop.participant_pre_finalize(
+    dkg_output, eq_input = encpedpop.participant_step2(
         enc_state, enc_cmsg, enc_shares_sums[idx]
     )
     # Include the enc_shares in eq_input to ensure that participants agree on all
@@ -260,9 +260,9 @@ def coordinator_step(
 
 
 def coordinator_finalize(
-    state: CoordinatorState, pmsgs2: List[ParticipantMsg2]
+    state2: CoordinatorState, pmsgs2: List[ParticipantMsg2]
 ) -> Tuple[CoordinatorMsg2, DKGOutput, RecoveryData]:
-    (params, eq_input, dkg_output) = state
+    (params, eq_input, dkg_output) = state2
     cert = certifying_eq_coordinator_step([pmsg2.sig for pmsg2 in pmsgs2])
     if not certifying_eq_verify(params.hostpubkeys, eq_input, cert):
         raise SessionNotFinalizedError

reference/encpedpop.py

@@ -108,7 +108,7 @@ def participant_step(
     return state, pmsg
 
 
-def participant_pre_finalize(
+def participant_step2(
     state: ParticipantState,
     cmsg: CoordinatorMsg,
     enc_shares_sum: Scalar,
@@ -119,7 +119,7 @@ def participant_pre_finalize(
     enc_context = t.to_bytes(4, byteorder="big") + b"".join(enckeys)
     shares_sum = decrypt_sum(enc_shares_sum, deckey, enckeys, idx, enc_context)
     shares_sum += self_share
-    dkg_output, eq_input = simplpedpop.participant_pre_finalize(
+    dkg_output, eq_input = simplpedpop.participant_step2(
         simpl_state, simpl_cmsg, shares_sum
     )
     eq_input += b"".join(enckeys)

reference/simplpedpop.py

@@ -138,7 +138,7 @@ def participant_step(
     return state, msg, shares
 
 
-def participant_pre_finalize(
+def participant_step2(
     state: ParticipantState,
     cmsg: CoordinatorMsg,
     shares_sum: Scalar,
@@ -193,7 +193,6 @@ def participant_pre_finalize(
 # Sum the commitments to the i-th coefficients from the given vss_commitments
 # for i > 0. This procedure is introduced by Pedersen in section 5.1 of
 # 'Non-Interactive and Information-Theoretic Secure Verifiable Secret Sharing'.
-# TODO Should this be called coordinator_pre_finalize? (same in encpedpop)
 def coordinator_step(
     pmsgs: List[ParticipantMsg], t: int, n: int
 ) -> Tuple[CoordinatorMsg, DKGOutput, bytes]:

reference/tests.py

@@ -40,7 +40,7 @@ def simulate_simplpedpop(seeds, t) -> List[Tuple[simplpedpop.DKGOutput, bytes]]:
     for i in range(n):
         shares_sum = Scalar.sum(*([pret[2][i] for pret in prets]))
         pre_finalize_rets += [
-            simplpedpop.participant_pre_finalize(prets[i][0], cmsg, shares_sum)
+            simplpedpop.participant_step2(prets[i][0], cmsg, shares_sum)
         ]
     return pre_finalize_rets
 
@@ -70,7 +70,7 @@ def simulate_encpedpop(seeds, t) -> List[Tuple[simplpedpop.DKGOutput, bytes]]:
     pre_finalize_rets = [(cout, ceq)]
     for i in range(n):
         pre_finalize_rets += [
-            encpedpop.participant_pre_finalize(pstates[i], cmsg, enc_shares_sums[i])
+            encpedpop.participant_step2(pstates[i], cmsg, enc_shares_sums[i])
         ]
     return pre_finalize_rets