Improve usability for coordinator demo (#48)

Fix test values
Improve identifier input so it doesn't need to be in quotes
Remove unecessary text

coordinator/src/step_1.rs

@@ -2,6 +2,7 @@ use frost_ed25519 as frost;
 
 use frost::{keys::PublicKeyPackage, Error, Identifier};
 
+use eyre::eyre;
 use std::io::{BufRead, Write};
 
 pub struct ParticipantsConfig {
@@ -34,7 +35,15 @@ fn validate(
 }
 
 // TODO: validate min num of participants
-// TODO: validate participant must exist
+
+pub fn read_identifier(input: &mut impl BufRead) -> Result<Identifier, Box<dyn std::error::Error>> {
+    let mut identifier_input = String::new();
+    input.read_line(&mut identifier_input)?;
+    let bytes = hex::decode(identifier_input.trim())?;
+    let serialization = bytes.try_into().map_err(|_| eyre!("Invalid Identifier"))?;
+    let identifier = Identifier::deserialize(&serialization)?;
+    Ok(identifier)
+}
 
 // Input required:
 // 1. public key package
@@ -61,11 +70,7 @@ fn choose_participants(
         let package = pub_key_package.clone();
         writeln!(logger, "Identifier for participant {:?} (hex encoded):", i).unwrap();
 
-        let mut identifier_input = String::new();
-
-        input.read_line(&mut identifier_input).unwrap();
-
-        let id_value = serde_json::from_str(&identifier_input).unwrap();
+        let id_value = read_identifier(input).unwrap();
 
         validate(id_value, package, &participants)?;
 

coordinator/src/step_2.rs

@@ -32,15 +32,13 @@ fn request_inputs_commitments(
     logger: &mut dyn Write,
     participants: Vec<Identifier>,
 ) -> Result<SigningPackage, Box<dyn std::error::Error>> {
-    writeln!(logger, "The message to be signed")?;
+    writeln!(logger, "The message to be signed (hex encoded)")?;
 
     let mut msg = String::new();
     input.read_line(&mut msg)?;
 
     let message = hex::decode(msg.trim())?;
 
-    writeln!(logger, "The number of signers: ")?;
-
     let mut commitments_list: BTreeMap<Identifier, SigningCommitments> = BTreeMap::new();
 
     for p in participants {

coordinator/src/step_3.rs

@@ -29,13 +29,6 @@ fn request_inputs_signature_shares(
     participants: ParticipantsConfig,
     signing_package: SigningPackage,
 ) -> Result<Signature, Box<dyn std::error::Error>> {
-    writeln!(
-        logger,
-        "The number of signers: {}",
-        participants.participants.len()
-    )?;
-    println!("{}", participants.participants.len());
-
     let mut signatures_list: HashMap<Identifier, SignatureShare> = HashMap::new();
 
     for p in participants.participants {

coordinator/src/tests/steps.rs

@@ -98,7 +98,7 @@ fn check_step_3() {
         signing_package,
     );
 
-    let expected = "The number of signers: 2\nPlease enter JSON encoded signatures for participant Identifier(\"0100000000000000000000000000000000000000000000000000000000000000\"):\nPlease enter JSON encoded signatures for participant Identifier(\"0300000000000000000000000000000000000000000000000000000000000000\"):\nGroup signature: \"72c948a63797c693e8e978fdb703a1f5a7590472a539da13b71dd6c2b8c1b2a664b7b4af6194439357c5d15f366760fce53c985a186709e74bb0f8e5078ea805\"\n";
+    let expected = "Please enter JSON encoded signatures for participant Identifier(\"0100000000000000000000000000000000000000000000000000000000000000\"):\nPlease enter JSON encoded signatures for participant Identifier(\"0300000000000000000000000000000000000000000000000000000000000000\"):\nGroup signature: \"72c948a63797c693e8e978fdb703a1f5a7590472a539da13b71dd6c2b8c1b2a664b7b4af6194439357c5d15f366760fce53c985a186709e74bb0f8e5078ea805\"\n";
 
     let (_, res) = &buf.into_parts();
     let actual = hex::encode(res.as_ref().unwrap());

coordinator/src/tests/values.md

@@ -14,19 +14,19 @@ num of participants:
 Identifier for participant 1:
 
 ```
-"0100000000000000000000000000000000000000000000000000000000000000"
+0100000000000000000000000000000000000000000000000000000000000000
 ```
 
 Identifier for participant 3:
 
 ```
-"0300000000000000000000000000000000000000000000000000000000000000"
+0300000000000000000000000000000000000000000000000000000000000000
 ```
 
 Message to be signed:
 
 ```
-9c9879ea25578cd0ea40aadea10bcba5517c2395632725c435ae
+74657374
 ```
 
 Commitment for Identifier 1: