Merge pull request hyperledger-indy#922 from hyperledger/feature/pool-connections

Pool Connections

Author: Vyacheslav

cli/src/commands/ledger.rs

@@ -357,6 +357,10 @@ pub mod get_validator_info_command {
         };
 
         for (node, response) in responses {
+            if response.eq("timeout") {
+                println_err!("Restart pool node {} timeout.", node);
+                continue
+            }
             let response = serde_json::from_str::<Response<serde_json::Value>>(&response)
                 .map_err(|err| println_err!("Invalid data has been received: {:?}", err))?;
             println_succ!("Get validator info response for node {}:", node);
@@ -687,6 +691,11 @@ pub mod pool_restart_command {
         };
 
         for (node, response) in responses {
+            if response.eq("timeout") {
+                println_err!("Restart pool node {} timeout.", node);
+                continue
+            }
+
             let response = serde_json::from_str::<Response<serde_json::Value>>(&response)
                 .map_err(|err| println_err!("Invalid data has been received: {:?}", err))?;
 

libindy/Cargo.lock

@@ -41,7 +41,7 @@ memzero_sodium = ["sodiumoxide"]
 fatal_warnings = []
 
 [dependencies]
-indy-crypto = { version = "=0.4.1-dev-47", optional = true }
+indy-crypto = { version = "=0.4.1-dev-50", optional = true }
 int_traits = { version = "0.1.1", optional = true }
 digest = "0.6.2"
 env_logger = "0.5.10"

libindy/Cargo.toml

@@ -208,9 +208,13 @@ impl LedgerCommandExecutor {
             }
             LedgerCommand::SubmitAck(handle, result) => {
                 info!(target: "ledger_command_executor", "SubmitAck command received");
-                self.send_callbacks.borrow_mut().remove(&handle)
-                    .expect("Expect callback to process ack command")
-                    (result.map_err(IndyError::from));
+                match self.send_callbacks.borrow_mut().remove(&handle) {
+                    Some(cb) => cb(result.map_err(IndyError::from)),
+                    None => {
+                        error!("Can't process LedgerCommand::SubmitAck for handle {} with result {:?} - appropriate callback not found!",
+                               handle, result);
+                    }
+                }
             }
             LedgerCommand::RegisterSPParser(txn_type, parser, free, cb) => {
                 info!(target: "ledger_command_executor", "RegisterSPParser command received");

libindy/src/commands/ledger.rs

@@ -25,6 +25,9 @@ extern crate named_type_derive;
 
 extern crate indy_crypto;
 extern crate libsqlite3_sys;
+extern crate rlp;
+extern crate byteorder;
+extern crate time;
 extern crate libc;
 extern crate rand;
 extern crate rusqlite;