CLI prints DID after create operation

trustchain-cli/src/bin/main.rs

@@ -15,12 +15,14 @@ use trustchain_cli::config::cli_config;
 use trustchain_core::{
     vc::{CredentialError, DataCredentialError},
     verifier::Verifier,
+    JSON_FILE_EXTENSION,
 };
 use trustchain_ion::{
     attest::attest_operation,
     create::{create_operation, create_operation_mnemonic},
     trustchain_resolver,
     verifier::TrustchainVerifier,
+    CREATE_OPERATION_FILENAME_PREFIX,
 };
 
 fn cli() -> Command {
@@ -131,20 +133,29 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                     if mnemonic && file_path.is_some() {
                         panic!("Please use only one of '--file_path' and '--mnemonic'.")
                     }
+                    let filename: String;
                     if !mnemonic {
                         // Read doc state from file path
                         let doc_state = if let Some(file_path) = file_path {
                             Some(serde_json::from_reader(File::open(file_path)?)?)
                         } else {
                             None
                         };
-                        create_operation(doc_state, verbose)?;
+                        filename = create_operation(doc_state, verbose)?;
                     } else {
                         let mut mnemonic = String::new();
                         println!("Enter a mnemonic:");
                         std::io::stdin().read_line(&mut mnemonic).unwrap();
-                        create_operation_mnemonic(&mnemonic, None)?;
+                        filename = create_operation_mnemonic(&mnemonic, None)?;
                     }
+                    println!(
+                        "Created new DID: {}",
+                        filename
+                            .strip_prefix(CREATE_OPERATION_FILENAME_PREFIX)
+                            .unwrap_or_else(|| &filename)
+                            .strip_suffix(JSON_FILE_EXTENSION)
+                            .unwrap_or_else(|| &filename)
+                    );
                 }
                 Some(("attest", sub_matches)) => {
                     let did = sub_matches.get_one::<String>("did").unwrap();

trustchain-core/src/key_manager.rs

@@ -1,8 +1,9 @@
 //! Key management API with default implementations.
-use crate::TRUSTCHAIN_DATA;
+use crate::{JSON_FILE_EXTENSION, TRUSTCHAIN_DATA};
 use serde_json::{from_str, to_string_pretty as to_json};
 use ssi::jwk::JWK;
 use ssi::one_or_many::OneOrMany;
+use std::fmt::format;
 use std::fs::{File, OpenOptions};
 use std::io::{Read, Write};
 use std::path::{Path, PathBuf};
@@ -151,10 +152,10 @@ pub trait KeyManager {
     ) -> Result<PathBuf, KeyManagerError> {
         // Get the stem for the corresponding key type
         let file_name = match key_type {
-            KeyType::UpdateKey => "update_key.json",
-            KeyType::NextUpdateKey => "next_update_key.json",
-            KeyType::RecoveryKey => "recovery_key.json",
-            KeyType::SigningKey => "signing_key.json",
+            KeyType::UpdateKey => format!("update_key{}", JSON_FILE_EXTENSION),
+            KeyType::NextUpdateKey => format!("next_update_key{}", JSON_FILE_EXTENSION),
+            KeyType::RecoveryKey => format!("recovery_key{}", JSON_FILE_EXTENSION),
+            KeyType::SigningKey => format!("signing_key{}", JSON_FILE_EXTENSION),
         };
 
         // Get environment for TRUSTCHAIN_DATA

trustchain-core/src/lib.rs

@@ -30,3 +30,5 @@ pub const TRUSTCHAIN_PROOF_SERVICE_ID_VALUE: &str = "trustchain-controller-proof
 
 /// The value of the type for the service containing a Trustchain controller proof within a DID document.
 pub const TRUSTCHAIN_PROOF_SERVICE_TYPE_VALUE: &str = "TrustchainProofService";
+
+pub const JSON_FILE_EXTENSION: &str = ".json";

trustchain-ion/src/attest.rs

@@ -1,5 +1,6 @@
 //! ION operation for DID attestation.
 use crate::ion::IONTest as ION;
+use crate::ATTEST_OPERATION_FILENAME_PREFIX;
 use did_ion::sidetree::DIDStatePatch;
 use did_ion::sidetree::PublicKeyJwk;
 use did_ion::sidetree::{DIDSuffix, Operation, Sidetree};
@@ -10,6 +11,7 @@ use trustchain_core::key_manager::{ControllerKeyManager, KeyType};
 use trustchain_core::resolver::TrustchainResolver;
 use trustchain_core::subject::Subject;
 use trustchain_core::utils::get_operations_path;
+use trustchain_core::JSON_FILE_EXTENSION;
 use trustchain_core::TRUSTCHAIN_PROOF_SERVICE_ID_VALUE;
 
 use crate::controller::IONController;
@@ -103,8 +105,10 @@ pub async fn attest_operation(
     // operation_manager.save(operation, OperationType::Update)?;
     let path = get_operations_path()?;
     let path = path.join(format!(
-        "attest_operation_{}.json",
-        controller.controlled_did_suffix()
+        "{}{}{}",
+        ATTEST_OPERATION_FILENAME_PREFIX,
+        controller.controlled_did_suffix(),
+        JSON_FILE_EXTENSION
     ));
     std::fs::write(path, to_json(&operation).unwrap())?;
 

trustchain-ion/src/create.rs

@@ -3,6 +3,7 @@ use crate::attestor::{AttestorData, IONAttestor};
 use crate::controller::{ControllerData, IONController};
 use crate::ion::IONTest as ION;
 use crate::mnemonic::IONKeys;
+use crate::CREATE_OPERATION_FILENAME_PREFIX;
 use bip39::Mnemonic;
 use did_ion::sidetree::{CreateOperation, DIDStatePatch};
 use did_ion::sidetree::{DocumentState, PublicKeyEntry, PublicKeyJwk};
@@ -13,6 +14,7 @@ use ssi::one_or_many::OneOrMany;
 use std::convert::TryFrom;
 use trustchain_core::controller::Controller;
 use trustchain_core::utils::{generate_key, get_operations_path};
+use trustchain_core::JSON_FILE_EXTENSION;
 
 /// Collection of methods to return DID information from an operation.
 pub trait OperationDID {
@@ -73,8 +75,10 @@ fn write_create_operation(
     // Write create operation to push to ION server
     let path = get_operations_path().unwrap();
     let filename = format!(
-        "create_operation_{}.json",
-        controller.controlled_did_suffix()
+        "{}{}{}",
+        CREATE_OPERATION_FILENAME_PREFIX,
+        controller.controlled_did_suffix(),
+        JSON_FILE_EXTENSION
     );
     std::fs::write(
         path.join(&filename),
@@ -275,7 +279,10 @@ mod test {
 
         // Try to read outputted create operations and check they deserialize
         let path = get_operations_path()?;
-        let pattern = path.join("create_operation_*.json");
+        let pattern = path.join(format!(
+            "{}*{}",
+            CREATE_OPERATION_FILENAME_PREFIX, JSON_FILE_EXTENSION
+        ));
         let pattern = pattern.into_os_string().into_string().unwrap();
         let paths = glob(pattern.as_str())?;
 

trustchain-ion/src/lib.rs

@@ -166,6 +166,9 @@ pub enum TrustchainBitcoinError {
 
 // DID
 pub const CONTROLLER_KEY: &str = "controller";
+pub const CREATE_OPERATION_FILENAME_PREFIX: &str = "create_operation_";
+pub const ATTEST_OPERATION_FILENAME_PREFIX: &str = "attest_operation_";
+// pub const UPDATE_OPERATION_FILENAME_PREFIX: &str = "update_operation_";
 
 // ION
 pub const ION_METHOD: &str = "ion";