From f4d26d69bc11f5ef3916037beab859f596594817 Mon Sep 17 00:00:00 2001
From: Jeff Burdges <burdges@gnunet.org>
Date: Tue, 30 Jul 2024 18:29:45 +0200
Subject: [PATCH] Again not FROST since removing 1-round version

---
 benches/olaf_benchmarks.rs             | 10 +++++-----
 src/olaf/mod.rs                        |  4 ++--
 src/olaf/{frost => multisig}/errors.rs |  4 ++--
 src/olaf/{frost => multisig}/mod.rs    |  0
 src/olaf/{frost => multisig}/types.rs  |  0
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename src/olaf/{frost => multisig}/errors.rs (99%)
 rename src/olaf/{frost => multisig}/mod.rs (100%)
 rename src/olaf/{frost => multisig}/types.rs (100%)

diff --git a/benches/olaf_benchmarks.rs b/benches/olaf_benchmarks.rs
index 5da97d8..2086d1f 100644
--- a/benches/olaf_benchmarks.rs
+++ b/benches/olaf_benchmarks.rs
@@ -2,9 +2,9 @@ use criterion::criterion_main;
 
 mod olaf_benches {
     use criterion::{criterion_group, BenchmarkId, Criterion};
-    use schnorrkel::olaf::frost::aggregate;
+    use schnorrkel::olaf::multisig::aggregate;
     use schnorrkel::keys::{PublicKey, Keypair};
-    use schnorrkel::olaf::frost::{SigningPackage, SigningNonces, SigningCommitments};
+    use schnorrkel::olaf::multisig::{SigningPackage, SigningNonces, SigningCommitments};
     use schnorrkel::olaf::simplpedpop::AllMessage;
 
     fn benchmark_simplpedpop(c: &mut Criterion) {
@@ -46,8 +46,8 @@ mod olaf_benches {
         group.finish();
     }
 
-    fn benchmark_frost(c: &mut Criterion) {
-        let mut group = c.benchmark_group("FROST");
+    fn benchmark_multisig(c: &mut Criterion) {
+        let mut group = c.benchmark_group("multisig");
 
         group.sample_size(10);
 
@@ -138,7 +138,7 @@ mod olaf_benches {
         config = Criterion::default();
         targets =
             benchmark_simplpedpop,
-            benchmark_frost,
+            benchmark_multisig,
     }
 }
 
diff --git a/src/olaf/mod.rs b/src/olaf/mod.rs
index 7a2b746..2d49927 100644
--- a/src/olaf/mod.rs
+++ b/src/olaf/mod.rs
@@ -4,8 +4,8 @@
 /// Implementation of the SimplPedPoP protocol.
 pub mod simplpedpop;
 
-/// Implementation of the FROST protocol.
-pub mod frost;
+/// Implementation of the two-round non-deterministic multisig protocol.
+pub mod multisig;
 
 use curve25519_dalek::{constants::RISTRETTO_BASEPOINT_POINT, RistrettoPoint, Scalar};
 use merlin::Transcript;
diff --git a/src/olaf/frost/errors.rs b/src/olaf/multisig/errors.rs
similarity index 99%
rename from src/olaf/frost/errors.rs
rename to src/olaf/multisig/errors.rs
index fb97914..d279675 100644
--- a/src/olaf/frost/errors.rs
+++ b/src/olaf/multisig/errors.rs
@@ -1,4 +1,4 @@
-//! Errors of the FROST protocol.
+//! Errors of the two-round threshold multisig protocol.
 
 use core::array::TryFromSliceError;
 
@@ -57,7 +57,7 @@ mod tests {
     use rand_core::OsRng;
     use crate::{
         olaf::{
-            frost::{
+            multisig::{
                 aggregate,
                 types::{NonceCommitment, SigningCommitments},
                 SigningPackage,
diff --git a/src/olaf/frost/mod.rs b/src/olaf/multisig/mod.rs
similarity index 100%
rename from src/olaf/frost/mod.rs
rename to src/olaf/multisig/mod.rs
diff --git a/src/olaf/frost/types.rs b/src/olaf/multisig/types.rs
similarity index 100%
rename from src/olaf/frost/types.rs
rename to src/olaf/multisig/types.rs