Merge github.com:hyperledger/indy-sdk

Signed-off-by: Michael Lodder <[email protected]>

Author: mikelodder7

Jenkinsfile.cd

@@ -51,34 +51,54 @@ 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 "cargo test --no-run"
+
+                            echo "Windows Libnullpay Test: Run tests"
+                            withEnv([
+                                    "RUST_TEST_THREADS=1",
+                                    "RUST_LOG=indy::=debug,zmq=trace",
+                                    "TEST_POOL_IP=$INDY_SDK_SERVER_IP",
+                                    "PATH=$WORKSPACE\\libindy\\target\\debug;$PATH",
+                            ]) {
+                                bat "cargo test"
+                            }
+                        }
+                    }
+
+                    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 +234,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 +262,20 @@ 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"
+                        }
+                    }
+                },
+                "${env_name}-libnullpay-test": {
+                    dir('libnullpay') {
+                        testEnv.inside("--network=${network_name}") {
+                            echo "${env_name} Libnullpay Test: Test"
+
+                            echo "${env_name} Libnullpay Test: Build Test"
+                            sh "LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo test --no-run"
+
+                            echo "${env_name} Libnullpay 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'
                         }
                     }
                 },
@@ -272,7 +318,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 +331,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

@@ -176,14 +176,15 @@ Docker machine needs to be rebooted after these changes.
 ## Wrappers documentation
 
 The following wrappers are tested and complete. There is also active work
-on wrappers for Go and node.js; visit
+on a wrapper for Go; visit
 [#indy-sdk on Rocket.Chat](https://chat.hyperledger.org/channel/indy-sdk) for
 details.
 
 * [.Net](wrappers/dotnet/README.md)
 * [Java](wrappers/java/README.md)
 * [Python](wrappers/python/README.md)
 * [iOS](wrappers/ios/README.md)
+* [NodeJS](wrappers/nodejs/README.md)
 
 ## Indy CLI documentation
 * An explanation of how to install the official command line interface for that provides commands to manage wallets and interactions with the ledger: [Indy CLI](cli/README.md)

README.md

@@ -0,0 +1,30 @@
+#!/bin/bash -xe
+
+if [ "$1" = "--help" ] ; then
+  echo "Usage: <package> <version> <key> <type> <suffix> <repo> <host> <key>"
+  return
+fi
+
+package="$1"
+version="$2"
+type="$3"
+suffix="$4"
+repo="$5"
+host="$6"
+key="$7"
+
+[ -z $package ] && exit 1
+[ -z $version ] && exit 2
+[ -z $type ] && exit 3
+[ -z $suffix ] && exit 4
+[ -z $repo ] && exit 5
+[ -z $host ] && exit 6
+[ -z $key ] && exit 7
+
+sed -i -E -e 'H;1h;$!d;x' -e "s/$package ([(,),0-9,.]+)/$package ($version$suffix)/" debian/changelog
+
+dpkg-buildpackage -tc
+
+mkdir debs &&  mv ../*.deb ./debs/
+
+./sovrin-packaging/upload_debs.py ./debs $repo $type --host $host --ssh-key $key

cli/ci/.gitattributes renamed to ci/.gitattributes

@@ -0,0 +1,44 @@
+#!/bin/bash -xe
+
+if [ "$1" = "--help" ] ; then
+  echo "Usage: <package> <package_type> <version> <key> <type> <number>"
+  return
+fi
+
+package="$1"
+package_type="$2"
+version="$3"
+key="$4"
+type="$5"
+number="$6"
+
+[ -z $package ] && exit 1
+[ -z $package_type ] && exit 2
+[ -z $version ] && exit 3
+[ -z $key ] && exit 4
+[ -z $type ] && exit 5
+[ -z $number ] && exit 6
+
+TEMP_ARCH_DIR=./${package}-zip
+mkdir ${TEMP_ARCH_DIR}
+
+if [ ${package_type} = "lib" ] ; then
+  mkdir ${TEMP_ARCH_DIR}/lib
+  cp -r ./include ${TEMP_ARCH_DIR}
+  cp ./target/release/*.dll ${TEMP_ARCH_DIR}/lib/
+elif [ ${package_type} = "executable" ] ; then
+  cp ./target/release/*.dll ${TEMP_ARCH_DIR}/
+  cp ./target/release/${package}.exe ${TEMP_ARCH_DIR}/
+else
+  exit 2
+fi
+
+powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::CreateFromDirectory('${TEMP_ARCH_DIR}', '${package}_${version}.zip'); }"
+rm -rf ${TEMP_ARCH_DIR}
+
+cat <<EOF | sftp -v -oStrictHostKeyChecking=no -i $key [email protected]
+mkdir /var/repository/repos/windows/$package/$type/$version-$number
+cd /var/repository/repos/windows/$package/$type/$version-$number
+put -r ${package}_"${version}".zip
+ls -l /var/repository/repos/windows/$package/$type/$version-$number
+EOF

ci/deb-build-and-upload.sh

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

ci/win-zip-and-upload.sh

@@ -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");
+    }
 }