Merge branch 'master' into feature/deprecation

Author: jovfer

libindy/src/errors/common.rs

@@ -54,11 +54,11 @@ impl fmt::Display for CommonError {
             CommonError::InvalidParam2(ref description) => write!(f, "Invalid param 2: {}", description),
             CommonError::InvalidParam3(ref description) => write!(f, "Invalid param 3: {}", description),
             CommonError::InvalidParam4(ref description) => write!(f, "Invalid param 4: {}", description),
-            CommonError::InvalidParam5(ref description) => write!(f, "Invalid param 4: {}", description),
-            CommonError::InvalidParam6(ref description) => write!(f, "Invalid param 4: {}", description),
-            CommonError::InvalidParam7(ref description) => write!(f, "Invalid param 4: {}", description),
-            CommonError::InvalidParam8(ref description) => write!(f, "Invalid param 4: {}", description),
-            CommonError::InvalidParam9(ref description) => write!(f, "Invalid param 4: {}", description),
+            CommonError::InvalidParam5(ref description) => write!(f, "Invalid param 5: {}", description),
+            CommonError::InvalidParam6(ref description) => write!(f, "Invalid param 6: {}", description),
+            CommonError::InvalidParam7(ref description) => write!(f, "Invalid param 7: {}", description),
+            CommonError::InvalidParam8(ref description) => write!(f, "Invalid param 8: {}", description),
+            CommonError::InvalidParam9(ref description) => write!(f, "Invalid param 9: {}", description),
             CommonError::InvalidState(ref description) => write!(f, "Invalid library state: {}", description),
             CommonError::InvalidStructure(ref description) => write!(f, "Invalid structure: {}", description),
             CommonError::IOError(ref err) => err.fmt(f)

libindy/src/services/pool/mod.rs

@@ -164,7 +164,7 @@ impl PoolWorker {
 
         let gen_tnxs = PoolWorker::_build_node_state(&merkle_tree)?;
 
-        for (_, gen_txn) in &gen_tnxs {
+        for gen_txn in gen_tnxs.values() {
             let mut rn: RemoteNode = match RemoteNode::new(&gen_txn) {
                 Ok(rn) => rn,
                 Err(err) => {

libindy/src/services/pool/transaction_handler.rs

@@ -262,7 +262,7 @@ impl TransactionHandler {
                         "Can't flash all transaction requests with common success status".to_string())));
             }
             Err(_) => {
-                for (_, pending_cmd) in &mut self.pending_commands {
+                for pending_cmd in self.pending_commands.values_mut() {
                     pending_cmd.terminate_parent_cmds(false)?
                 }
                 Ok(())
@@ -652,7 +652,7 @@ impl TransactionHandler {
             self.pending_commands.remove(&cmd);
         }
 
-        for (_, pc) in &mut self.pending_commands {
+        for pc in self.pending_commands.values_mut() {
             let is_timeout = pc.resendable_request.as_ref()
                 .and_then(|resend| resend.next_try_send_time)
                 .map(|next_try_send_time| next_try_send_time <= time::now_utc())