Merge remote-tracking branch 'upstream/master' into feature/rc_1_5_0

Author: jovfer

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"
@@ -230,23 +234,21 @@ def linuxTesting(file, env_name, network_name, stashBuildResults) {
             }
         }
 
-        if (env_name == 'Ubuntu') { // TODO: Delete condition IS-702
-            sh "cp libnullpay/target/release/libnullpay.so cli"
-            sh "cp libindy/target/release/libindy.so cli"
-            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 "cp libnullpay/target/release/libnullpay.so cli"
+        sh "cp libindy/target/release/libindy.so cli"
+        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 --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'
+                echo "${env_name} Indy Cli Test: Build Tests"
+                sh 'LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo test --release --features "nullpay_plugin" --no-run'
 
-                    echo "${env_name} Indy Cli Test: Run tests"
-                    sh 'LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test  --release --features "nullpay_plugin"'
+                echo "${env_name} Indy Cli Test: Run tests"
+                sh 'LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test  --release --features "nullpay_plugin"'
 
-                    if (stashBuildResults) {
-                        stash includes: 'target/release/indy-cli', name: 'IndyCliUbuntuBuildResult'
-                    }
+                if (stashBuildResults) {
+                    stash includes: 'target/release/indy-cli', name: 'IndyCliUbuntuBuildResult'
                 }
             }
         }
@@ -288,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"
@@ -308,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"
@@ -336,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"
@@ -629,7 +631,7 @@ def publishingRCtoStable() {
                 publishLibindyCliWindowsFilesRCtoStable(libindyVersion)
 
                 echo 'Moving Windows RC artifacts to Stable: libnullpay'
-                publishLibnullpayWindowsFilesRCtoStable(libindyVersion)
+                publishLibnullpayWindowsFilesRCtoStable()
 
                 echo 'Moving Ubuntu RC artifacts to Stable: libnullpay'
                 publishLibnullpayDebRCtoStable(testEnv)
@@ -676,7 +678,7 @@ def publishLibindyCliDebRCtoStable(testEnv, version) {
 
 def publishLibnullpayDebRCtoStable(testEnv) {
     def libnullpayVersion = getSrcVersion("libnullpay")
-    publishDebRCtoStable(testEnv, "libnullpay", "libnullpay", libnullpayVersion, "libindyCliDebs", false)
+    publishDebRCtoStable(testEnv, "libnullpay", "libnullpay", libnullpayVersion, "libnullpayDebs", false)
 }
 
 def publishDebRCtoStable(testEnv, packageName, folder, version, stashName, moveDevArtifacts) {
@@ -685,7 +687,7 @@ def publishDebRCtoStable(testEnv, packageName, folder, version, stashName, moveD
 
         unstash name: stashName
 
-        sh "fakeroot deb-reversion -v $version $packageName/debs/\"$packageName\"_\"$rcFullVersion\"_amd64.deb"
+        sh "fakeroot deb-reversion -v $version $folder/debs/\"$packageName\"_\"$rcFullVersion\"_amd64.deb"
 
         if (moveDevArtifacts) {
             sh "fakeroot deb-reversion -v $version $folder/debs/\"$packageName\"-dev_\"$rcFullVersion\"_amd64.deb"

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"
                         }
                     }
                 },
@@ -362,10 +362,6 @@ def linuxNodejsTesting(env_name, network_name, testEnv) {
 }
 
 def linuxCLITesting(env_name, network_name, testEnv) {
-    if (env_name == "RedHat"){ // TODO: Delete it IS-702
-        return;
-    }
-
     unstash name: "LibindyCliSO${env_name}"
     unstash name: "LibnullpayCliSO${env_name}"
 
@@ -457,4 +453,4 @@ def setupBrewPackages() {
     sh "brew switch libsodium 1.0.12"
     sh "brew switch openssl 1.0.2l"
     sh "brew switch zeromq 4.2.3"
-}
+}

README.md

@@ -114,6 +114,7 @@ After successfully compiling `libindy`, you will need to add the path containing
 * [RHEL based distributions (Amazon Linux 2017.03)](doc/rhel-build.md)
 * [Windows](doc/windows-build.md)
 * [MacOS](doc/mac-build.md)
+* [Android](doc/android-build.md)
 
 **Note:**
 By default `cargo build` produce debug artifacts with a large amount of run-time checks.

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/common.rs

@@ -112,7 +112,7 @@ pub mod load_plugin_command {
 }
 
 pub fn load_plugin(ctx: &CommandContext, library: &str, initializer: &str) -> Result<(), ()> {
-    let lib = libloading::Library::new(library)
+    let lib = _load_lib(library)
         .map_err(|_| println_err!("Plugin not found: {:?}", library))?;
 
     unsafe {
@@ -131,6 +131,17 @@ pub fn load_plugin(ctx: &CommandContext, library: &str, initializer: &str) -> Re
     Ok(())
 }
 
+#[cfg(all(unix, test))]
+fn _load_lib(library: &str) -> libloading::Result<libloading::Library> {
+    libloading::os::unix::Library::open(Some(library), ::libc::RTLD_NOW | ::libc::RTLD_NODELETE)
+        .map(libloading::Library::from)
+}
+
+#[cfg(any(not(unix), not(test)))]
+fn _load_lib(library: &str) -> libloading::Result<libloading::Library> {
+    libloading::Library::new(library)
+}
+
 pub mod exit_command {
     use super::*;
 
@@ -202,7 +213,7 @@ pub mod tests {
     }
 
     pub fn load_null_payment_plugin(ctx: &CommandContext) -> () {
-        let lib = libloading::Library::new(NULL_PAYMENT_PLUGIN).unwrap();
+        let lib = _load_lib(NULL_PAYMENT_PLUGIN).unwrap();
         unsafe {
             let init_func: libloading::Symbol<unsafe extern fn() -> ErrorCode> = lib.get(NULL_PAYMENT_PLUGIN_INIT_FUNCTION.as_bytes()).unwrap();
             init_func();

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()
     }
-}
+}