Merge pull request #431 from EspressoSystems/ak/dkg-catch-up2

DKG Catchup

Author: alxiong

tests/src/tests/timeboost/block_order.rs

@@ -27,7 +27,7 @@ async fn block_order() {
     init_logging();
 
     let num = NonZeroUsize::new(5).unwrap();
-    let (_enc_key, cfg) = make_configs(num, RECOVER_INDEX);
+    let (enc_key, cfg) = make_configs(num, RECOVER_INDEX);
 
     let mut rxs = Vec::new();
     let mut tasks = JoinSet::new();
@@ -75,14 +75,10 @@ async fn block_order() {
     }
 
     // wait until DKG is done
-    // enc_key.wait().await;
-    // tracing::info!("DKG done");
+    enc_key.wait().await;
+    tracing::info!("DKG done");
 
-    // FIXME: (alex) after DKG catchup, we use actual enc_key above
-    // currently late-joining nodes might never finish its DKG because sailfish vertices are pruned
-    // thus, we only generate non-encrypted bundles for now
-    let enc_key_tmp = timeboost_crypto::prelude::ThresholdEncKeyCell::default();
-    tasks.spawn(gen_bundles(enc_key_tmp, bcast.clone()));
+    tasks.spawn(gen_bundles(enc_key, bcast.clone()));
 
     // Collect all outputs:
     let mut outputs: Vec<Vec<BlockInfo>> = vec![Vec::new(); num.get()];

tests/src/tests/timeboost/transaction_order.rs

@@ -28,7 +28,7 @@ async fn transaction_order() {
     init_logging();
 
     let num = NonZeroUsize::new(5).unwrap();
-    let (_enc_key, cfg) = make_configs(num, RECOVER_INDEX);
+    let (enc_key, cfg) = make_configs(num, RECOVER_INDEX);
 
     let mut rxs = Vec::new();
     let mut tasks = JoinSet::new();
@@ -74,14 +74,10 @@ async fn transaction_order() {
     }
 
     // wait until DKG is done
-    // enc_key.wait().await;
-    // tracing::info!("DKG done");
+    enc_key.wait().await;
+    tracing::info!("DKG done");
 
-    // FIXME: (alex) after DKG catchup, we use actual enc_key above
-    // currently late-joining nodes might never finish its DKG because sailfish vertices are pruned
-    // thus, we only generate non-encrypted bundles for now
-    let enc_key_tmp = timeboost_crypto::prelude::ThresholdEncKeyCell::default();
-    tasks.spawn(gen_bundles(enc_key_tmp, bcast.clone()));
+    tasks.spawn(gen_bundles(enc_key, bcast.clone()));
 
     for _ in 0..NUM_OF_TRANSACTIONS {
         let first = rxs[0].recv().await.unwrap();