update jortestkit (#3904)

Author: dkijania

Cargo.lock

@@ -3,8 +3,7 @@ use assert_cmd::assert::OutputAssertExt;
 use assert_fs::{prelude::*, NamedTempFile};
 use chain_impl_mockchain::vote::Choice;
 use jormungandr_lib::interfaces::TaxType;
-use jortestkit::file;
-use jortestkit::process::output_extensions::ProcessOutput;
+use jortestkit::{file, process::output_extensions::ProcessOutput};
 use std::path::Path;
 
 #[derive(Debug)]
@@ -156,7 +155,7 @@ impl Certificate {
             .as_single_line()
     }
 
-    pub fn stake_pool_id<P: AsRef<Path>>(self, input_file: P) -> String {
+    pub fn stake_pool_id<P: AsRef<Path>>(self, input_file: P) -> Result<String, std::io::Error> {
         println!("Running get stake pool id...");
         let temp_file = NamedTempFile::new("stake_pool.id").unwrap();
         self.command
@@ -168,7 +167,7 @@ impl Certificate {
         file::read_file(temp_file.path())
     }
 
-    pub fn vote_plan_id<S: Into<String>>(self, cert: S) -> String {
+    pub fn vote_plan_id<S: Into<String>>(self, cert: S) -> Result<String, std::io::Error> {
         println!("Running get stake pool id...");
         let input_file = NamedTempFile::new("cert_file").unwrap();
         input_file.write_str(&cert.into()).unwrap();

testing/jormungandr-automation/src/jcli/api/certificate.rs

@@ -24,7 +24,7 @@ impl CommunicationKey {
     }
 
     #[allow(clippy::wrong_self_convention)]
-    pub fn to_public(self, input: String) -> String {
+    pub fn to_public(self, input: String) -> Result<String, std::io::Error> {
         let input_file = NamedTempFile::new("input.tmp").unwrap();
         input_file.write_str(&input).unwrap();
         let output_file = NamedTempFile::new("output.tmp").unwrap();

testing/jormungandr-automation/src/jcli/api/votes/committee/communication_key.rs

@@ -16,7 +16,10 @@ impl MemberKey {
     }
 
     #[allow(clippy::wrong_self_convention)]
-    pub fn to_public<S: Into<String>>(self, member_secret_key: S) -> String {
+    pub fn to_public<S: Into<String>>(
+        self,
+        member_secret_key: S,
+    ) -> Result<String, std::io::Error> {
         let input_file = NamedTempFile::new("member_key.tmp").unwrap();
         input_file.write_str(&member_secret_key.into()).unwrap();
 

testing/jormungandr-automation/src/jcli/api/votes/committee/member_key.rs

@@ -29,7 +29,10 @@ impl Votes {
         Crs::new(self.votes_command.crs())
     }
 
-    pub fn election_public_key<S: Into<String>>(self, member_key: S) -> String {
+    pub fn election_public_key<S: Into<String>>(
+        self,
+        member_key: S,
+    ) -> Result<String, std::io::Error> {
         let output_file = NamedTempFile::new("election_public_key.tmp").unwrap();
         self.votes_command
             .election_public_key(member_key, output_file.path())

testing/jormungandr-automation/src/jcli/api/votes/mod.rs

@@ -24,7 +24,7 @@ impl CertificateBuilder {
         stake_pool_id: &str,
         stake_key_pub: &str,
         stake_key_file: &Path,
-    ) -> String {
+    ) -> Result<String, std::io::Error> {
         let temp_dir = TempDir::new().unwrap();
 
         let stake_delegation_cert = self

testing/jormungandr-automation/src/jcli/services/certificate_builder.rs

@@ -299,8 +299,8 @@ pub fn compare_schema<P: AsRef<Path>>(actual_schema_path: P) {
         PathBuf::from_str("./jormungandr-automation/resources/explorer/graphql/schema.graphql")
             .unwrap();
 
-    if !file::have_the_same_content(actual_schema_path.as_ref(), &expected_schema_path) {
-        file::copy_file(actual_schema_path.as_ref(), &expected_schema_path, true);
+    if !file::have_the_same_content(actual_schema_path.as_ref(), &expected_schema_path).unwrap() {
+        file::copy_file(actual_schema_path.as_ref(), &expected_schema_path, true).unwrap();
         println!("discrepancies detected, already replaced file with new content. Please commit to update schema");
     }
 }

testing/jormungandr-automation/src/jormungandr/explorer/mod.rs

@@ -52,5 +52,7 @@ pub fn get_jormungandr_bin(release: &Release, temp_dir: &impl PathChild) -> Path
     let release_dir = temp_dir.child(format!("release-{}", release.version()));
     release_dir.create_dir_all().unwrap();
     decompress(output.path(), release_dir.path()).unwrap();
-    file::find_file(release_dir.path(), "jormungandr").unwrap()
+    file::find_file(release_dir.path(), "jormungandr")
+        .unwrap()
+        .unwrap()
 }

testing/jormungandr-automation/src/jormungandr/legacy/mod.rs

@@ -211,7 +211,7 @@ impl RemoteJormungandrBuilder {
 
     pub fn with_node_config(mut self, node_config: PathBuf) -> Self {
         self.node_config =
-            Some(serde_yaml::from_str(&jortestkit::file::read_file(node_config)).unwrap());
+            Some(serde_yaml::from_str(&jortestkit::file::read_file(node_config).unwrap()).unwrap());
         self
     }
 

testing/jormungandr-automation/src/jormungandr/remote.rs

@@ -25,7 +25,7 @@ pub fn test_create_and_sign_new_stake_delegation() {
 
     let input_file = temp_dir.child("certificate");
     input_file.write_str(&certificate).unwrap();
-    let stake_pool_id = jcli.certificate().stake_pool_id(input_file.path());
+    let stake_pool_id = jcli.certificate().stake_pool_id(input_file.path()).unwrap();
     let certificate = jcli
         .certificate()
         .new_stake_delegation(&stake_pool_id, &owner.identifier().to_bech32_str());