Move to Arc/RwLock

crypto/frost/src/sign.rs

@@ -1,5 +1,5 @@
 use core::fmt;
-use std::{rc::Rc, collections::HashMap};
+use std::{sync::Arc, collections::HashMap};
 
 use rand_core::{RngCore, CryptoRng};
 
@@ -19,7 +19,7 @@ use crate::{
 #[derive(Clone)]
 pub struct Params<C: Curve, A: Algorithm<C>> {
   algorithm: A,
-  keys: Rc<MultisigKeys<C>>,
+  keys: Arc<MultisigKeys<C>>,
   view: MultisigView<C>,
 }
 
@@ -27,7 +27,7 @@ pub struct Params<C: Curve, A: Algorithm<C>> {
 impl<C: Curve, A: Algorithm<C>> Params<C, A> {
   pub fn new(
     algorithm: A,
-    keys: Rc<MultisigKeys<C>>,
+    keys: Arc<MultisigKeys<C>>,
     included: &[u16],
   ) -> Result<Params<C, A>, FrostError> {
     let mut included = included.to_vec();
@@ -297,7 +297,7 @@ impl<C: Curve, A: Algorithm<C>> AlgorithmMachine<C, A> {
   /// Creates a new machine to generate a key for the specified curve in the specified multisig
   pub fn new(
     algorithm: A,
-    keys: Rc<MultisigKeys<C>>,
+    keys: Arc<MultisigKeys<C>>,
     included: &[u16],
   ) -> Result<AlgorithmMachine<C, A>, FrostError> {
     Ok(

crypto/frost/src/tests/mod.rs

@@ -1,4 +1,4 @@
-use std::{rc::Rc, collections::HashMap};
+use std::{sync::Arc, collections::HashMap};
 
 use rand_core::{RngCore, CryptoRng};
 
@@ -36,7 +36,7 @@ pub fn clone_without<K: Clone + std::cmp::Eq + std::hash::Hash, V: Clone>(
 
 pub fn key_gen<R: RngCore + CryptoRng, C: Curve>(
   rng: &mut R
-) -> HashMap<u16, Rc<MultisigKeys<C>>> {
+) -> HashMap<u16, Arc<MultisigKeys<C>>> {
   let mut params = HashMap::new();
   let mut machines = HashMap::new();
 
@@ -98,7 +98,7 @@ pub fn key_gen<R: RngCore + CryptoRng, C: Curve>(
     }
     assert_eq!(group_key.unwrap(), these_keys.group_key());
 
-    keys.insert(*i, Rc::new(these_keys));
+    keys.insert(*i, Arc::new(these_keys));
   }
 
   keys
@@ -120,7 +120,7 @@ pub fn recover<C: Curve>(keys: &HashMap<u16, MultisigKeys<C>>) -> C::F {
 pub fn algorithm_machines<R: RngCore, C: Curve, A: Algorithm<C>>(
   rng: &mut R,
   algorithm: A,
-  keys: &HashMap<u16, Rc<MultisigKeys<C>>>,
+  keys: &HashMap<u16, Arc<MultisigKeys<C>>>,
 ) -> HashMap<u16, AlgorithmMachine<C, A>> {
   let mut included = vec![];
   while included.len() < usize::from(keys[&1].params().t()) {

crypto/frost/src/tests/schnorr.rs

@@ -1,4 +1,4 @@
-use std::{marker::PhantomData, rc::Rc, collections::HashMap};
+use std::{marker::PhantomData, sync::Arc, collections::HashMap};
 
 use rand_core::{RngCore, CryptoRng};
 
@@ -80,7 +80,7 @@ pub(crate) fn core_batch_verify<R: RngCore + CryptoRng, C: Curve>(rng: &mut R) {
 fn sign_core<R: RngCore + CryptoRng, C: Curve>(
   rng: &mut R,
   group_key: C::G,
-  keys: &HashMap<u16, Rc<MultisigKeys<C>>>
+  keys: &HashMap<u16, Arc<MultisigKeys<C>>>
 ) {
   const MESSAGE: &'static [u8] = b"Hello, World!";
 
@@ -111,7 +111,7 @@ fn sign_with_offset<R: RngCore + CryptoRng, C: Curve>(rng: &mut R) {
 
   let offset = C::hash_to_F(b"FROST Test sign_with_offset", b"offset");
   for i in 1 ..= u16::try_from(keys.len()).unwrap() {
-    keys.insert(i, Rc::new(keys[&i].offset(offset)));
+    keys.insert(i, Arc::new(keys[&i].offset(offset)));
   }
   let offset_key = group_key + (C::GENERATOR_TABLE * offset);
 

crypto/frost/src/tests/vectors.rs

@@ -1,4 +1,4 @@
-use std::{rc::Rc, collections::HashMap};
+use std::{sync::Arc, collections::HashMap};
 
 use crate::{
   Curve, MultisigKeys,
@@ -73,7 +73,7 @@ pub fn vectors<C: Curve, H: Hram<C>>(vectors: Vectors) {
       *i,
       AlgorithmMachine::new(
         Schnorr::<C, H>::new(),
-        Rc::new(keys[i].clone()),
+        Arc::new(keys[i].clone()),
         vectors.included.clone()
       ).unwrap()
     ));