Fix trusted dealer participant identifier output to be a hex encoded …

…string (#32)

trusted-dealer/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-frost-ed25519 = "0.4.0"
+frost-ed25519 = { path = "../../frost/frost-ed25519/" }
 thiserror = "1.0"
 rand = "0.8"
 hex = "0.4"

trusted-dealer/src/output.rs

@@ -26,22 +26,25 @@ pub fn print_values(
 ) {
     logger.log(format!(
         "Group public key: {:x?}",
-        hex::encode(pubkeys.group_public.to_bytes())
+        hex::encode(pubkeys.group_public().to_bytes())
     ));
 
     println!("---");
 
     for (k, v) in keys.iter().sorted_by_key(|x| x.0) {
-        logger.log(format!("Participant {:?}", k));
+        logger.log(format!(
+            "Participant: {:?}",
+            hex::encode(Identifier::serialize(k))
+        ));
         logger.log(format!(
             "Secret share: {:?}",
-            hex::encode(v.value.to_bytes())
+            hex::encode(v.value().to_bytes())
         ));
         logger.log(format!(
             "Public key: {:?}",
-            hex::encode(pubkeys.signer_pubkeys[k].to_bytes())
+            hex::encode(pubkeys.signer_pubkeys()[k].to_bytes())
         ));
-        logger.log(format!("Commitment: {}", encode_commitment(&v.commitment)));
+        logger.log(format!("Commitment: {}", encode_commitment(v.commitment())));
         println!("---")
     }
 }

trusted-dealer/src/tests/integration_test.rs

@@ -21,12 +21,12 @@ fn check_keygen_with_dealer() {
         signature_gen::generate_nonces_and_commitments(config.min_signers, &key_packages, &mut rng);
     let message = "message to sign".as_bytes();
     let comms = commitments.into_values().collect();
-    let signing_package = frost::SigningPackage::new(comms, message.to_vec());
+    let signing_package = frost::SigningPackage::new(comms, message);
     let signature_shares =
         signature_gen::generate_signature_shares(nonces, &key_packages, &signing_package);
     let group_signature =
         frost::aggregate(&signing_package, &signature_shares[..], &pubkeys).unwrap();
-    let verify_signature = pubkeys.group_public.verify(message, &group_signature);
+    let verify_signature = pubkeys.group_public().verify(message, &group_signature);
 
     assert!(verify_signature.is_ok());
 }
@@ -45,12 +45,12 @@ fn check_keygen_with_dealer_with_large_num_of_signers() {
         signature_gen::generate_nonces_and_commitments(config.min_signers, &key_packages, &mut rng);
     let message = "message to sign".as_bytes();
     let comms = commitments.into_values().collect();
-    let signing_package = frost::SigningPackage::new(comms, message.to_vec());
+    let signing_package = frost::SigningPackage::new(comms, message);
     let signature_shares =
         signature_gen::generate_signature_shares(nonces, &key_packages, &signing_package);
     let group_signature =
         frost::aggregate(&signing_package, &signature_shares[..], &pubkeys).unwrap();
-    let verify_signature = pubkeys.group_public.verify(message, &group_signature);
+    let verify_signature = pubkeys.group_public().verify(message, &group_signature);
 
     assert!(verify_signature.is_ok());
 }
@@ -76,12 +76,12 @@ fn check_keygen_with_dealer_with_secret() {
     );
     let message = "message to sign".as_bytes();
     let comms = commitments.into_values().collect();
-    let signing_package = frost::SigningPackage::new(comms, message.to_vec());
+    let signing_package = frost::SigningPackage::new(comms, message);
     let signature_shares =
         signature_gen::generate_signature_shares(nonces, &key_packages, &signing_package);
     let group_signature =
         frost::aggregate(&signing_package, &signature_shares[..], &pubkeys).unwrap();
-    let verify_signature = pubkeys.group_public.verify(message, &group_signature);
+    let verify_signature = pubkeys.group_public().verify(message, &group_signature);
 
     assert!(verify_signature.is_ok());
 }
@@ -107,12 +107,12 @@ fn check_keygen_with_dealer_with_secret_with_large_num_of_signers() {
     );
     let message = "message to sign".as_bytes();
     let comms = commitments.into_values().collect();
-    let signing_package = frost::SigningPackage::new(comms, message.to_vec());
+    let signing_package = frost::SigningPackage::new(comms, message);
     let signature_shares =
         signature_gen::generate_signature_shares(nonces, &key_packages, &signing_package);
     let group_signature =
         frost::aggregate(&signing_package, &signature_shares[..], &pubkeys).unwrap();
-    let verify_signature = pubkeys.group_public.verify(message, &group_signature);
+    let verify_signature = pubkeys.group_public().verify(message, &group_signature);
 
     assert!(verify_signature.is_ok());
 }