Merge branch 'master' into bugfix/IS-721

Author: jovfer

Jenkinsfile.cd

@@ -492,7 +492,7 @@ def windowsPublishArtifact(testEnv, folder, packageName, packageType, packageVer
         unstash name: stashName
 
         withCredentials([file(credentialsId: 'SovrinRepoSSHKey', variable: 'repo_key')]) {
-            sh "ci/win-zip-and-upload.sh $folder $packageName $packageType $packageVersion '${repo_key}' master 1"
+            sh "ci/win-zip-and-upload.sh $folder $packageName $packageType $packageVersion '${repo_key}' $env.BRANCH_NAME $env.BUILD_NUMBER"
         }
     }
 }

cli/src/commands/ledger.rs

@@ -650,18 +650,29 @@ pub mod pool_restart_command {
             .and_then(|request| Ledger::sign_and_submit_request(pool_handle, wallet_handle, &submitter_did, &request))
             .map_err(|err| handle_transaction_error(err, Some(&submitter_did), Some(&pool_name), Some(&wallet_name)))?;
 
-        let response = serde_json::from_str::<Response<serde_json::Value>>(&response)
-            .map_err(|err| println_err!("Invalid data has been received: {:?}", err))?;
+        let responses = match serde_json::from_str::<HashMap<String, String>>(&response) {
+            Ok(responses) => responses,
+            Err(_) => {
+                let response = serde_json::from_str::<Response<serde_json::Value>>(&response)
+                    .map_err(|err| println_err!("Invalid data has been received: {:?}", err))?;
+                return handle_transaction_response(response).map(|result| println_succ!("{}", result));
+            }
+        };
+
+        for (node, response) in responses {
+            let response = serde_json::from_str::<Response<serde_json::Value>>(&response)
+                .map_err(|err| println_err!("Invalid data has been received: {:?}", err))?;
+
+            println_succ!("Restart pool response for node {}:", node);
+            let _res = handle_transaction_response(response).map(|result|
+                print_table(&result, &[
+                    ("identifier", "From"),
+                    ("reqId", "Request Id"),
+                    ("action", "Action"),
+                    ("datetime", "Datetime")]));
+        }
+        let res = Ok(());
 
-        let res = handle_transaction_response(response)
-            .map(|result| print_transaction_response(result,
-                                                     "Restart pool request has been sent to Ledger.",
-                                                     None,
-                                                     &[
-                                                         ("isSuccess", "IsSuccess"),
-                                                         ("msg", "Message"),
-                                                         ("action", "Action"),
-                                                         ("datetime", "Datetime")]));
         trace!("execute << {:?}", res);
         res
     }
@@ -2389,7 +2400,6 @@ pub mod tests {
         use super::*;
 
         #[test]
-        #[ignore]
         pub fn pool_restart_works() {
             TestUtils::cleanup_storage();
             let datetime = r#"2020-01-25T12:49:05.258870+00:00"#;

cli/src/commands/pool.rs

@@ -87,6 +87,7 @@ pub mod connect_command {
                         set_connected_pool(ctx, Some((handle, name.to_owned())));
                         Ok(println_succ!("Pool \"{}\" has been connected", name))
                     }
+                    Err(ErrorCode::PoolLedgerNotCreatedError) => Err(println_err!("Pool \"{}\" does not exist.", name)),
                     Err(ErrorCode::CommonIOError) => Err(println_err!("Pool \"{}\" does not exist.", name)),
                     Err(ErrorCode::PoolLedgerNotCreatedError) => Err(println_err!("Pool \"{}\" does not exist.", name)),
                     Err(ErrorCode::PoolLedgerTerminated) => Err(println_err!("Pool \"{}\" does not exist.", name)),

libindy/src/services/wallet/iterator.rs

@@ -35,7 +35,12 @@ impl WalletIterator {
 
             let tags = decrypt_tags(&next_storage_entity.tags, &self.keys.tag_name_key, &self.keys.tag_value_key)?;
 
-            Ok(Some(WalletRecord::new(name, None, value, tags)))
+            let type_ = match next_storage_entity.type_ {
+                None => None,
+                Some(encrypted_type) => Some(String::from_utf8(decrypt(&encrypted_type, &self.keys.type_key)?)?)
+            };
+
+            Ok(Some(WalletRecord::new(name, type_, value, tags)))
         } else { Ok(None) }
     }