Merge branch 'master' into android_arm_fix

Author: faisal00813

Jenkinsfile.cd

@@ -171,8 +171,12 @@ def linuxTesting(file, env_name, network_name, stashBuildResults) {
 
                 try {
                     def libindyFeatures = "--features sodium_static"
+                    def libindyBuildFeatures = "--features \"fatal_warnings sodium_static\""
 
                     echo "${env_name} Libindy Test: Build"
+                    sh "RUST_BACKTRACE=1 cargo build --release $libindyBuildFeatures"
+
+                    echo "${env_name} Libindy Test: Build tests"
                     sh "RUST_BACKTRACE=1 cargo test --release --no-run $libindyFeatures"
 
                     echo "${env_name} Libindy Test: Run tests"
@@ -235,7 +239,7 @@ def linuxTesting(file, env_name, network_name, stashBuildResults) {
         dir('cli') {
             testEnv.inside("--ip=\"10.0.0.3\" --network=${network_name}") {
                 echo "${env_name} Indy Cli Test: Build"
-                sh "LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo build --release"
+                sh "LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo build --release --features fatal_warnings"
 
                 echo "${env_name} Indy Cli Test: Build Tests"
                 sh 'LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo test --release --features "nullpay_plugin" --no-run'
@@ -286,7 +290,7 @@ def windowsTesting() {
                                 "PATH=$WORKSPACE\\libindy\\prebuilt\\lib;$PATH",
                                 "RUST_BACKTRACE=1"
                         ]) {
-                            bat "cargo build --release"
+                            bat "cargo build --release --features fatal_warnings"
                             bat "cargo test --release --no-run"
 
                             echo "Windows Libindy Test: Run tests"
@@ -306,7 +310,7 @@ def windowsTesting() {
                         withEnv([
                                 "RUST_BACKTRACE=1"
                         ]) {
-                            bat "cargo build --release"
+                            bat "cargo build --release --features fatal_warnings"
                             bat "cargo test --release --no-run"
 
                             echo "Windows Libnullpay Test: Run tests"
@@ -334,7 +338,7 @@ def windowsTesting() {
                         withEnv([
                                 "RUST_BACKTRACE=1"
                         ]) {
-                            bat "cargo build --release"
+                            bat "cargo build --release --features fatal_warnings"
 
                             echo "Windows Indy Cli Test: Build tests"
                             bat "cargo test --release $featuresArgs --no-run"

Jenkinsfile.ci

@@ -45,7 +45,7 @@ def windowsTesting() {
                                 "PATH=$WORKSPACE\\libindy\\prebuilt\\lib;$PATH",
                                 "RUST_BACKTRACE=1"
                         ]) {
-                            bat "cargo build"
+                            bat "cargo build --features fatal_warnings"
                             bat "cargo test --no-run"
 
                             echo "Windows Libindy Test: Run tests"
@@ -64,7 +64,7 @@ def windowsTesting() {
                         withEnv([
                                 "RUST_BACKTRACE=1"
                         ]) {
-                            bat "cargo build"
+                            bat "cargo build --features fatal_warnings"
                             bat "cargo test --no-run"
 
                             echo "Windows Libnullpay Test: Run tests"
@@ -133,7 +133,7 @@ def macosTesting() {
                     echo "MacOS Test: Build"
                     setupRust()
                     setupBrewPackages()
-                    sh "cargo build"
+                    sh "cargo build --features fatal_warnings"
                     sh "cargo test --no-run"
                     // TODO testing
                 }
@@ -226,15 +226,15 @@ def linuxTesting(file, env_name, network_name) {
         poolInst = openPool(env_name, network_name)
 
         def testEnv
-        def libindyFeatures = "--features sodium_static"
+        def additionalFeatures = "sodium_static"
 
         dir('libindy') {
             echo "${env_name} Libindy Test: Build docker image"
             testEnv = dockerBuild('libindy', file)
 
             testEnv.inside("--ip=\"10.0.0.3\" --network=${network_name}") {
                 echo "${env_name} Libindy Test: Build"
-                sh "cargo build $libindyFeatures"
+                sh "cargo build --features \"fatal_warnings $additionalFeatures\""
             }
         }
 
@@ -249,7 +249,7 @@ def linuxTesting(file, env_name, network_name) {
 
             testEnv.inside("--ip=\"10.0.0.3\" --network=${network_name}") {
                 echo "${env_name} Libnullpay Test: Build"
-                sh "LIBRARY_PATH=./ cargo build"
+                sh "LIBRARY_PATH=./ cargo build --features fatal_warnings"
             }
         }
 
@@ -268,10 +268,10 @@ def linuxTesting(file, env_name, network_name) {
                             echo "${env_name} Libindy Test: Test"
 
                             echo "${env_name} Libindy Test: Build Test"
-                            sh "RUST_BACKTRACE=1 cargo test --no-run $libindyFeatures"
+                            sh "RUST_BACKTRACE=1 cargo test --no-run --features $additionalFeatures"
 
                             echo "${env_name} Libindy Test: Run tests"
-                            sh "RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test $libindyFeatures"
+                            sh "RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test --features  $additionalFeatures"
                         }
                     }
                 },

ci/indy-pool.dockerfile

@@ -19,14 +19,14 @@ RUN pip3 install -U \
 	setuptools
 
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88
-ARG indy_stream=master
+ARG indy_stream=stable
 RUN echo "deb https://repo.sovrin.org/deb xenial $indy_stream" >> /etc/apt/sources.list
 
 RUN useradd -ms /bin/bash -u $uid indy
 
-ARG indy_plenum_ver=1.4.419
-ARG indy_anoncreds_ver=1.0.32
-ARG indy_node_ver=1.4.480
+ARG indy_plenum_ver=1.4.45
+ARG indy_anoncreds_ver=1.0.11
+ARG indy_node_ver=1.4.66
 ARG python3_indy_crypto_ver=0.4.1
 ARG indy_crypto_ver=0.4.0
 

cli/Cargo.toml

@@ -6,6 +6,9 @@ authors = ["Vyacheslav Gudkov <[email protected]>"]
 [features]
 nullpay_plugin = []
 
+# Causes the build to fail on all warnings
+fatal_warnings = []
+
 [dependencies]
 ansi_term = "0.10"
 chrono = "0.4"
@@ -22,4 +25,4 @@ serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
 term = "0.4.6"
-rpassword = "1.0.0"
+rpassword = "1.0.0"

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))?;
 

cli/src/commands/mod.rs

@@ -117,6 +117,13 @@ pub fn get_object_param<'a>(name: &'a str, params: &'a CommandParams) -> Result<
     }
 }
 
+pub fn get_opt_object_param<'a>(name: &'a str, params: &'a CommandParams) -> Result<Option<serde_json::Value>, ()> {
+    match params.get(name) {
+        Some(_) => Ok(Some(get_object_param(name, params)?)),
+        None => Ok(None)
+    }
+}
+
 fn extract_array_tuples<'a>(param: &'a str) -> Vec<String> {
     let re = Regex::new(r#"\(([^\(\)]+)\),?"#).unwrap();
     re.captures_iter(param).map(|c| c[1].to_string()).collect::<Vec<String>>()

cli/src/commands/pool.rs

@@ -121,7 +121,7 @@ pub mod connect_command {
             match Pool::close(handle) {
                 Ok(()) => {
                     set_connected_pool(ctx, Some((handle, name.to_owned())));
-                    println_succ!("Pool \"{}\" has been connected", name)
+                    println_succ!("Pool \"{}\" has been disconnected", name)
                 }
                 Err(err) => println_err!("Indy SDK error occurred {:?}", err),
             }
@@ -576,4 +576,4 @@ pub mod tests {
         let pools = Pool::list().unwrap();
         serde_json::from_str(&pools).unwrap()
     }
-}
+}