updated cargo.lock

Signed-off-by: Kyle Den Hartog <kdenhar@gmail.com>
jovfer · Jan 11, 2019 · 1ea1282 · 1ea1282
2 parents 35e95ea + 0150ff5
commit 1ea1282
Show file tree

Hide file tree

Showing 55 changed files with 1,410 additions and 1,458 deletions.
diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd
@@ -481,14 +481,13 @@ def linuxVcxJavaTesting(env_name, network_name, testEnv, stashBuildResults) {
 def linuxVcxPythonTesting(env_name, network_name, testEnv, stashBuildResults) {
     unstash name: "VcxPythonLibvcxSO${env_name}"
     unstash name: "VcxPythonLibindyAndLibnullpaySO${env_name}"
+
     dir('vcx/wrappers/python3') {
-
-
         testEnv.inside {
             echo "${env_name} Vcx Test: Test python wrapper"
 
             sh '''
-                    python3.5 -m pip install --user pytest==3.4.2 qrcode pytest-asyncio
+                    python3.5 -m pip install --user pytest==3.6.4 pytest-asyncio
                     LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} python3.5 -m pytest -s
             '''
         }
@@ -564,10 +563,10 @@ def windowsTesting() {
                         stash includes: 'target/release/*.dll', name: 'LibnullpayWindowsBuildResult'
                     }
 
-                    bat "copy $WORKSPACE\\libnullpay\\target\\release\\nullpay.dll $WORKSPACE\\cli"
+                    bat "PowerShell.exe \"Copy-Item $WORKSPACE/libnullpay/target/release/nullpay.dll -Destination $WORKSPACE/cli\""
 
                     dir('cli') {
-                        bat "sed -i -e \"s/10\\.0\\.0\\.2/${INDY_SDK_SERVER_IP}/g\" docker_pool_transactions_genesis"
+                        bat "PowerShell.exe \"&{(Get-Content -Path docker_pool_transactions_genesis -Raw) -replace '10\\.0\\.0\\.2','$INDY_SDK_SERVER_IP'} | Set-Content -Path docker_pool_transactions_genesis\""
 
                         def featuresArgs = ''
 //                      def featuresArgs = '--features "nullpay_plugin"' // disabled because of IS-1109
@@ -594,10 +593,16 @@ def windowsTesting() {
                         stash includes: 'target/release/indy-cli.exe,target/release/*.dll', name: 'IndyCliWindowsBuildResult'
                     }
 
-                    bat "copy $WORKSPACE\\libnullpay\\target\\release\\nullpay.dll $WORKSPACE\\vcx\\libvcx"
+                    bat "PowerShell.exe \"Copy-Item $WORKSPACE/libnullpay/target/release/nullpay.dll -Destination $WORKSPACE/vcx/libvcx\""
 
                     dir('vcx/libvcx') {
                         echo "Windows Libvcx Test: Build"
+
+                        // FIXME remove that once https://jira.hyperledger.org/browse/IS-1127 is resolved
+                        bat """
+                            PowerShell.exe "&{(Get-Content -Path src/settings.rs -Raw) -replace '/tmp/test_init.json','./test_init.json'} | Set-Content -Path src/settings.rs"
+                        """
+
                         withEnv([
                                 "OPENSSL_DIR=$WORKSPACE\\libindy\\prebuilt",
                                 "RUST_BACKTRACE=1"

diff --git a/Jenkinsfile.ci b/Jenkinsfile.ci
@@ -84,10 +84,10 @@ def windowsTesting() {
                         }
                     }
 
-                    bat "copy $WORKSPACE\\libnullpay\\target\\debug\\nullpay.dll $WORKSPACE\\cli"
+                    bat "PowerShell.exe \"Copy-Item $WORKSPACE/libnullpay/target/debug/nullpay.dll -Destination $WORKSPACE/cli\""
 
                     dir('cli') {
-                        bat "sed -i -e \"s/10\\.0\\.0\\.2/${INDY_SDK_SERVER_IP}/g\" docker_pool_transactions_genesis"
+                        bat "PowerShell.exe \"&{(Get-Content -Path docker_pool_transactions_genesis -Raw) -replace '10\\.0\\.0\\.2','$INDY_SDK_SERVER_IP'} | Set-Content -Path docker_pool_transactions_genesis\""
 
                         def featuresArgs = ''
 //                      def featuresArgs = '--features "nullpay_plugin"' // disabled because of IS-1109
@@ -109,10 +109,16 @@ def windowsTesting() {
                         }
                     }
 
-                    bat "copy $WORKSPACE\\libnullpay\\target\\debug\\nullpay.dll $WORKSPACE\\vcx\\libvcx"
+                    bat "PowerShell.exe \"Copy-Item $WORKSPACE/libnullpay/target/debug/nullpay.dll -Destination $WORKSPACE/vcx/libvcx\""
 
                     dir('vcx/libvcx') {
                         echo "Windows Libvcx Test: Build"
+
+                        // FIXME remove that once https://jira.hyperledger.org/browse/IS-1127 is resolved
+                        bat """
+                            PowerShell.exe "&{(Get-Content -Path src/settings.rs -Raw) -replace '/tmp/test_init.json','./test_init.json'} | Set-Content -Path src/settings.rs"
+                        """
+
                         withEnv([
                                 "OPENSSL_DIR=$WORKSPACE\\libindy\\prebuilt",
                                 "RUST_BACKTRACE=1"
@@ -616,7 +622,7 @@ def linuxVcxPythonTesting(env_name, network_name, testEnv) {
             echo "${env_name} Vcx Test: Test python wrapper"
 
             sh '''
-                    python3.5 -m pip install --user pytest==3.4.2 qrcode pytest-asyncio
+                    python3.5 -m pip install --user pytest==3.6.4 pytest-asyncio
                     LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} python3.5 -m pytest -s
             '''
         }

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ rewritten but still contains some useful ideas.
 
 The major artifact of the SDK is a C-callable library that provides the basic building blocks for 
 the creation of applications on the top of [Hyperledger Indy](https://www.hyperledger.org/projects/hyperledger-indy).
-It is available for most popular desktop, mobile and server platfrorms.
+It is available for most popular desktop, mobile and server platforms.
 
 ### Libindy wrappers
 

diff --git a/cli/src/commands/ledger.rs b/cli/src/commands/ledger.rs
@@ -271,7 +271,7 @@ pub mod schema_command {
     command!(CommandMetadata::build("schema", "Send Schema transaction to the Ledger.")
                 .add_required_param("name", "Schema name")
                 .add_required_param("version", "Schema version")
-                .add_required_param("attr_names", "Schema attributes split by comma")
+                .add_required_param("attr_names", "Schema attributes split by comma (the number of attributes should be less or equal than 125)")
                 .add_optional_param("fees_inputs","The list of source inputs")
                 .add_optional_param("fees_outputs","The list of outputs in the following format: (recipient, amount)")
                 .add_optional_param("extra","Optional information for fees payment operation")

diff --git a/doc/rhel-build.md b/doc/rhel-build.md
@@ -42,7 +42,7 @@ dnf install -y \
 For Amazon Linux 2017.03 or other distributions without `libsodium` available in system repositories:
 ```
 cd /tmp
-curl https://download.libsodium.org/libsodium/releases/libsodium-1.0.14.tar.gz | tar -xz
+curl https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.14.tar.gz | tar -xz
 cd /tmp/libsodium-1.0.14
 ./configure
 make

diff --git a/doc/ubuntu-build.md b/doc/ubuntu-build.md
@@ -19,7 +19,7 @@
  Because of this, it requires to build and install `libsodium` from source:
  ```
 cd /tmp && \
-   curl https://download.libsodium.org/libsodium/releases/libsodium-1.0.14.tar.gz | tar -xz && \
+   curl https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.14.tar.gz | tar -xz && \
     cd /tmp/libsodium-1.0.14 && \
     ./configure --disable-shared && \
     make && \

diff --git a/doc/windows-build.md b/doc/windows-build.md
@@ -43,7 +43,7 @@ git clone https://github.com/hyperledger/indy-sdk.git
 ### Binary deps
 
 - https://www.npcglib.org/~stathis/downloads/openssl-1.0.2k-vs2017.7z
-- https://download.libsodium.org/libsodium/releases/libsodium-1.0.14-msvc.zip
+- https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.14-msvc.zip
 
 ### Source deps