Merge branch 'master' of github.com:hyperledger/indy-sdk into feature/payments

Author: Nikita Khateev

Jenkinsfile.cd

@@ -51,34 +51,43 @@ def windowsTesting() {
                             echo "Windows Libindy Test: Run tests"
                             withEnv([
                                     "RUST_TEST_THREADS=1",
-                                    "RUST_LOG=indy::,zmq=trace",
+                                    "RUST_LOG=indy::=debug,zmq=trace",
                                     "TEST_POOL_IP=$INDY_SDK_SERVER_IP"
                             ]) {
                                 bat "cargo test"
                             }
                         }
                     }
 
+                    dir('libnullpay') {
+                        echo "Windows Libnullpay Test: Build"
+                        withEnv([
+                                "RUST_BACKTRACE=1"
+                        ]) {
+                            bat "cargo build"
+                        }
+                    }
+
+                    bat "copy $WORKSPACE\\libnullpay\\target\\debug\\nullpay.dll $WORKSPACE\\cli"
+
                     dir('cli') {
                         bat "sed -i -e \"s/10\\.0\\.0\\.2/${INDY_SDK_SERVER_IP}/g\" docker_pool_transactions_genesis"
 
-                        bat "copy $WORKSPACE\\libindy\\target\\debug\\indy.dll $WORKSPACE\\libindy\\prebuilt\\lib"
-                        bat "copy $WORKSPACE\\libindy\\target\\debug\\indy.lib $WORKSPACE\\libindy\\prebuilt\\lib"
+                        def featuresArgs = '--features "nullpay_plugin"'
 
                         echo "Windows Indy Cli Test: Build"
                         withEnv([
-                                "INDY_DIR=$WORKSPACE\\libindy\\prebuilt",
                                 "RUST_BACKTRACE=1"
                         ]) {
-                            bat "cargo test --no-run"
+                            bat "cargo test $featuresArgs --no-run"
 
                             echo "Windows Indy Cli Test: Run tests"
                             withEnv([
                                     "RUST_TEST_THREADS=1",
-                                    "RUST_LOG=indy::,zmq=trace",
+                                    "RUST_LOG=indy::=debug,zmq=trace",
                                     "TEST_POOL_IP=$INDY_SDK_SERVER_IP"
                             ]) {
-                                bat "cargo test"
+                                bat "cargo test $featuresArgs"
                             }
                         }
                     }
@@ -214,10 +223,23 @@ def linuxTesting(file, env_name, network_name) {
         sh "cp libindy/target/debug/libindy.so wrappers/java/lib"
         sh "cp libindy/target/debug/libindy.so wrappers/python"
         sh "cp libindy/target/debug/libindy.so cli"
+        sh "cp libindy/target/debug/libindy.so libnullpay"
+
+        dir('libnullpay') {
+            echo "${env_name} Libnullpay Test: Build docker image"
+
+            testEnv.inside("--ip=\"10.0.0.3\" --network=${network_name}") {
+                echo "${env_name} Libnullpay Test: Build"
+                sh "LIBRARY_PATH=./ cargo build"
+            }
+        }
+
+        sh "cp libnullpay/target/debug/libnullpay.so cli"
 
         stash includes: 'wrappers/java/lib/libindy.so', name: "LibindyJavaSO${env_name}"
         stash includes: 'wrappers/python/libindy.so', name: "LibindyPythonSO${env_name}"
         stash includes: 'cli/libindy.so', name: "LibindyCliSO${env_name}"
+        stash includes: 'cli/libnullpay.so', name: "LibnullpayCliSO${env_name}"
 
         parallel([
                 "${env_name}-libindy-test": {
@@ -229,7 +251,7 @@ def linuxTesting(file, env_name, network_name) {
                             sh "RUST_BACKTRACE=1 cargo test --no-run"
 
                             echo "${env_name} Libindy Test: Run tests"
-                            sh "RUST_BACKTRACE=1 RUST_LOG=indy::,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test"
+                            sh "RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test"
                         }
                     }
                 },
@@ -272,7 +294,7 @@ def linuxJavaTesting(env_name, network_name, testEnv) {
         testEnv.inside("--network=${network_name}") {
             echo "${env_name} Libindy Test: Test java wrapper"
 
-            sh "RUST_LOG=indy::,zmq=trace TEST_POOL_IP=10.0.0.2 mvn clean test"
+            sh "RUST_LOG=indy::=debug,zmq=trace TEST_POOL_IP=10.0.0.2 mvn clean test"
         }
     }
 }
@@ -285,21 +307,27 @@ def linuxPythonTesting(env_name, network_name, testEnv) {
 
             sh '''
                 python3.5 -m pip install --user -e .
-                LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_LOG=indy::,zmq=trace TEST_POOL_IP=10.0.0.2 python3.5 -m pytest
+                LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_LOG=indy::=debug,zmq=trace TEST_POOL_IP=10.0.0.2 python3.5 -m pytest
             '''
         }
     }
 }
 
 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}"
+
     dir('cli') {
         testEnv.inside("--network=${network_name}") {
             echo "${env_name} Indy Cli Test: Build"
-            sh "LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo test --no-run"
+            sh 'LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo test --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::,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test'
+            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 --features "nullpay_plugin"'
         }
     }
 }

Jenkinsfile.ci

@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Vyacheslav Gudkov <[email protected]>"]
 
 [features]
-payments_cli_tests = []
+nullpay_plugin = []
 
 [dependencies]
 ansi_term = "0.10"

cli/Cargo.toml

@@ -3,34 +3,33 @@ use std::fs;
 use std::path::Path;
 
 fn main() {
-    println!("cargo:rustc-link-lib=indy");
-
     let target = env::var("TARGET").unwrap();
     println!("target={}", target);
 
     if target.find("-windows-").is_some() {
-        println!("cargo:rustc-link-lib=ssleay32");
-        println!("cargo:rustc-link-lib=zmq");
-        println!("cargo:rustc-link-lib=sodium");
+        println!("cargo:rustc-link-lib=indy.dll");
 
-        // TODO: FIXME: Provide more reliable dependencies resolving
+        let profile = env::var("PROFILE").unwrap();
+        println!("profile={}", profile);
 
         let output_dir = env::var("OUT_DIR").unwrap();
-        let prebuilt_dir = env::var("INDY_DIR").unwrap();
+        println!("output_dir={}", output_dir);
+        let output_dir = Path::new(output_dir.as_str());
 
-        let dst = Path::new(&output_dir[..]).join("..\\..\\..");
-        let prebuilt_lib = Path::new(&prebuilt_dir[..]).join("lib");
+        let indy_dir = env::var("INDY_DIR").unwrap_or(format!("..\\libindy\\target\\{}", profile));
+        println!("indy_dir={}", indy_dir);
+        let indy_dir = Path::new(indy_dir.as_str());
 
-        println!("cargo:rustc-link-search=native={}", prebuilt_dir);
-        println!("cargo:rustc-flags=-L {}\\lib", prebuilt_dir);
-        println!("cargo:include={}\\include", prebuilt_dir);
+        let dst = output_dir.join("..\\..\\..");
+        println!("cargo:rustc-flags=-L {}", indy_dir.as_os_str().to_str().unwrap());
 
         let files = vec!["indy.dll", "libeay32md.dll", "libsodium.dll", "libzmq.dll", "ssleay32md.dll"];
         for f in files.iter() {
-            if let Ok(_) = fs::copy(&prebuilt_lib.join(f), &dst.join(f)) {
-                println!("copy {} -> {}", &prebuilt_lib.join(f).display(), &dst.join(f).display());
+            if let Ok(_) = fs::copy(&indy_dir.join(f), &dst.join(f)) {
+                println!("copy {} -> {}", &indy_dir.join(f).display(), &dst.join(f).display());
             }
         }
-        return;
-    } 
+    } else {
+        println!("cargo:rustc-link-lib=indy");
+    }
 }

cli/build.rs

@@ -113,7 +113,7 @@ pub mod load_plugin_command {
 
 pub fn load_plugin(ctx: &CommandContext, library: &str, initializer: &str) -> Result<(), ()> {
     let lib = libloading::Library::new(library)
-        .map_err(|_| println_err!("Plugin not found: \"{:?}\"", library))?;
+        .map_err(|_| println_err!("Plugin not found: {:?}", library))?;
 
     unsafe {
         let init_func: libloading::Symbol<unsafe extern fn() -> ErrorCode> = lib.get(initializer.as_bytes())
@@ -152,22 +152,55 @@ pub mod tests {
     use super::*;
 
     pub const NULL_PAYMENT_METHOD: &'static str = "null";
-    pub const NULL_PAYMENT_PLUGIN: &'static str = "libnullpay.so";
     pub const NULL_PAYMENT_PLUGIN_INIT_FUNCTION: &'static str = "nullpay_init";
 
+    #[cfg(any(unix))]
+    pub const NULL_PAYMENT_PLUGIN: &'static str = "libnullpay.so";
+    #[cfg(any(windows))]
+    pub const NULL_PAYMENT_PLUGIN: &'static str = "nullpay.dll";
+
     mod load {
         use super::*;
+        use utils::test::TestUtils;
 
         #[test]
-        #[cfg(feature = "payments_cli_tests")]
+        #[cfg(feature = "nullpay_plugin")]
         pub fn load_works() {
+            TestUtils::cleanup_storage();
+
             let ctx = CommandContext::new();
 
             let cmd = load_plugin_command::new();
             let mut params = CommandParams::new();
             params.insert("library", NULL_PAYMENT_PLUGIN.to_string());
             params.insert("initializer", NULL_PAYMENT_PLUGIN_INIT_FUNCTION.to_string());
             cmd.execute(&ctx, &params).unwrap();
+
+            TestUtils::cleanup_storage();
+        }
+
+        #[test]
+        #[cfg(feature = "nullpay_plugin")]
+        pub fn load_works_for_unknown_plugin() {
+            let ctx = CommandContext::new();
+
+            let cmd = load_plugin_command::new();
+            let mut params = CommandParams::new();
+            params.insert("library", "unknown_payment_plugin".to_string());
+            params.insert("initializer", NULL_PAYMENT_PLUGIN_INIT_FUNCTION.to_string());
+            cmd.execute(&ctx, &params).unwrap_err();
+        }
+
+        #[test]
+        #[cfg(feature = "nullpay_plugin")]
+        pub fn load_works_for_unknown_init_function() {
+            let ctx = CommandContext::new();
+
+            let cmd = load_plugin_command::new();
+            let mut params = CommandParams::new();
+            params.insert("library", NULL_PAYMENT_PLUGIN.to_string());
+            params.insert("initializer", "unknown_init_function".to_string());
+            cmd.execute(&ctx, &params).unwrap_err();
         }
     }