Merge branch 'master' into feature/contributor-resources

Author: jovfer

doc/windows-build.md

@@ -4,21 +4,21 @@
 
 1. Setup a windows virtual machine. Free images are available at [here](https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/)
 1. Launch the virtual machine 
-1. Download Visual Studio Community Edition 2017
+1. Download Visual Studio Community Edition 2017 (these instructions also work with Visual Studio Professional 2017)
 1. Check the boxes for the _Desktop development with C++_ and _Linux Development with C++_
 1. In the summary portion on the right hand side also check _C++/CLI support_
 1. Click install
 1. Download git-scm for windows [here](https://git-scm.com/downloads/win)
 1. Install git for windows using:
-  1. _Use Git from Git Bash Only_ so it doesn't change any path settings of the command prompt
-  1. _Checkout as is, commit Unix-style line endings_. You shouldn't be commiting anything anyway but just in case
-  1. _Use MinTTY_
-  1. Check all the boxes for:
-    1. Enable file system caching
-    1. Enable Git Credential Manager
-    1. Enable symbolic links
+   1. _Use Git from Git Bash Only_ so it doesn't change any path settings of the command prompt
+   1. _Checkout as is, commit Unix-style line endings_. You shouldn't be commiting anything anyway but just in case
+   1. _Use MinTTY_
+   1. Check all the boxes for:
+      1. Enable file system caching
+      1. Enable Git Credential Manager
+      1. Enable symbolic links
 1. Download rust for windows [here](https://www.rust-lang.org/en-US/install.html)
-  1. Choose installation option *1*
+   1. Choose installation option *1*
 
 ## Get/build dependencies
 
@@ -56,19 +56,19 @@ git clone https://github.com/hyperledger/indy-sdk.git
 
 Download http://www.sqlite.org/2017/sqlite-amalgamation-3180000.zip
 
-Create empty static library project and add sqlite.c file and 2 headers from extracted
+Create an empty static library project in Visual Studio and add `sqlite.c` file and 2 headers from extracted
 archive. Then just build it.
 
 ### Build libzmq
 
-Follow to https://http://zeromq.org/intro.
+Follow to http://zeromq.org/intro.
 - Download sources from last stable release for Windows. 
-- launch zeromq-x.x.x/builds/msvc/vs2015/libzmq.sln.
-- if necessary change solution platforms on x64(if you are working on x64 arch).
-- on main menu bar choose build->build libzmq.
-- if build project was succeed, in path zeromq-x.x.x/bin/x64/Debug/vXXX/dynamic has appeared
-    two files libzmq.dll and libzmq.lib.
-- rename libzmq.lib to zmq.lib.
+- Open `zeromq-x.x.x/builds/msvc/vs2015/libzmq.sln` with Visual Studio
+- If necessary change solution platforms on x64(if you are working on x64 arch).
+- On main menu bar choose build->build libzmq.
+- If build project was successful, two files `libzmq.dll` and `libzmq.lib` should appear 
+  in path `zeromq-x.x.x/bin/x64/Debug/vXXX/dynamic`.
+- rename `libzmq.lib` to `zmq.lib`.
 
 ## Build
 
@@ -82,18 +82,19 @@ Follow to https://http://zeromq.org/intro.
   ```
 
   Note that depending on the version of Visual Studio placement of vcvars64.bat can be different. For example, it can be
-  `C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat`  
-- execute "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+  `"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"`  
+- Execute `"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"`
 - Point path to this directory using environment variables:
-  - set INDY_PREBUILT_DEPS_DIR=C:\BIN\x64
-  - set INDY_CRYPTO_PREBUILT_DEPS_DIR=C:\BIN\x64
-  - set MILAGRO_DIR=C:\BIN\x64
-  - set LIBZMQ_PREFIX=C:\BIN\x64
-  - set SODIUM_LIB_DIR=C:\BIN\x64
-  - set OPENSSL_DIR=C:\BIN\x64
-- set PATH to find .dlls:
-  - set PATH=C:\BIN\x64\lib;%PATH%
-- change dir to indy-sdk/libindy and run cargo (you may want to add --release --target x86_64-pc-windows-msvc keys to cargo)
+  - `set INDY_PREBUILT_DEPS_DIR=C:\BIN\x64`
+  - `set INDY_CRYPTO_PREBUILT_DEPS_DIR=C:\BIN\x64`
+  - `set MILAGRO_DIR=C:\BIN\x64`
+  - `set LIBZMQ_PREFIX=C:\BIN\x64`
+  - `set SODIUM_LIB_DIR=C:\BIN\x64`
+  - `set OPENSSL_DIR=C:\BIN\x64`
+- Set PATH to find .dlls:
+  - `set PATH=C:\BIN\x64\lib;%PATH%`
+- change dir to `indy-sdk/libindy` and run `cargo build` (you may want to add `--release --target x86_64-pc-windows-msvc`
+  keys to cargo)
 
 ## openssl-sys workaround
 
@@ -109,7 +110,7 @@ and add
   println!("cargo:rustc-link-lib=dylib=gdi32");
 ```
 
-to the end of main() function.
+to the end of `main()` function.
 
 Then try to rebuild whole project.
 

libindy/src/services/anoncreds/prover.rs

@@ -297,7 +297,19 @@ impl Prover {
         match restrictions.as_ref() {
             // Convert old restrictions format to valid wql
             Some(&serde_json::Value::Array(ref array)) => {
-                query.insert("$or".to_string(), serde_json::Value::Array(array.to_vec()));
+                // skip Null's
+                let mut res: Vec<serde_json::Value> = Vec::new();
+                for sub_query in array {
+                    let sub_query = sub_query.as_object()
+                        .ok_or(CommonError::InvalidStructure("Restriction is invalid".to_string()))?
+                        .clone()
+                        .into_iter()
+                        .filter(|&(_, ref v)| !v.is_null())
+                        .collect();
+                    res.push(serde_json::Value::Object(sub_query));
+                }
+
+                query.insert("$or".to_string(), serde_json::Value::Array(res));
             }
             Some(&serde_json::Value::Object(ref object)) => {
                 query.extend(object.clone());
@@ -389,7 +401,7 @@ impl Prover {
         }
 
         for predicate in req_predicates_for_credential {
-            sub_proof_request_builder.add_predicate(&attr_common_view(&predicate.predicate_info.name),  "GE", predicate.predicate_info.p_value)?;
+            sub_proof_request_builder.add_predicate(&attr_common_view(&predicate.predicate_info.name), "GE", predicate.predicate_info.p_value)?;
         }
 
         let sub_proof_request = sub_proof_request_builder.finalize()?;
@@ -573,6 +585,31 @@ mod tests {
             assert_eq!(expected_query, _value(&query));
         }
 
+        #[test]
+        fn build_query_works_for_restriction_in_old_format_with_nulls() {
+            let ps = Prover::new();
+
+            let restriction_1 = json!({"schema_id": SCHEMA_ID, "issuer_did": serde_json::Value::Null});
+            let restriction_2 = json!({"schema_id":  serde_json::Value::Null, "cred_def_id": CRED_DEF_ID});
+            let restirctions = serde_json::Value::Array(vec![restriction_1, restriction_2]);
+
+            let query = ps.build_query(ATTR_NAME, ATTR_REFERENT, &Some(restirctions), &None).unwrap();
+
+            let expected_query = json!({
+                "attr::name::marker": ATTRIBUTE_EXISTENCE_MARKER,
+                "$or": vec![
+                    json!({
+                        "schema_id": SCHEMA_ID,
+                    }),
+                    json!({
+                        "cred_def_id": CRED_DEF_ID,
+                    })
+                ],
+            });
+
+            assert_eq!(expected_query, _value(&query));
+        }
+
         #[test]
         fn build_query_works_for_extra_query_with_other_referent() {
             let ps = Prover::new();
@@ -597,8 +634,8 @@ mod tests {
     mod attribute_satisfy_predicate {
         use super::*;
 
-        fn predicate_info() -> PredicateInfo{
-            PredicateInfo{
+        fn predicate_info() -> PredicateInfo {
+            PredicateInfo {
                 name: "age".to_string(),
                 p_type: PredicateTypes::GE,
                 p_value: 8,

libindy/tests/anoncreds.rs

@@ -1153,6 +1153,46 @@ mod high_cases {
 
                 WalletUtils::close_wallet(wallet_handle).unwrap();
             }
+
+            #[test]
+            fn prover_get_credentials_for_proof_req_works_for_null_restrictions() {
+                AnoncredsUtils::init_common_wallet();
+
+                let wallet_handle = WalletUtils::open_wallet(ANONCREDS_WALLET_CONFIG, WALLET_CREDENTIALS).unwrap();
+
+                let proof_req = r#"{
+                   "nonce":"123432421212",
+                   "name":"proof_req_1",
+                   "version":"0.1",
+                   "requested_attributes":{
+                      "attr1_referent":{
+                         "name":"name",
+                         "restrictions":[
+                            {
+                               "schema_id":null,
+                               "schema_issuer_did":null,
+                               "schema_name":null,
+                               "schema_version":null,
+                               "issuer_did":"NcYxiDXkpYi6ov5FcYDi1e",
+                               "cred_def_id":null
+                            }
+                         ]
+                      }
+                   },
+                   "requested_predicates":{
+                   }
+                }"#;
+
+                let credentials_json = AnoncredsUtils::prover_get_credentials_for_proof_req(wallet_handle, &proof_req).unwrap();
+
+                let credentials: CredentialsForProofRequest = serde_json::from_str(&credentials_json).unwrap();
+                assert_eq!(credentials.attrs.len(), 1);
+
+                let credentials_for_attr_1 = credentials.attrs.get("attr1_referent").unwrap();
+                assert_eq!(credentials_for_attr_1.len(), 1);
+
+                WalletUtils::close_wallet(wallet_handle).unwrap();
+            }
         }
 
         mod attribute_restrictions_wql_format {

wrappers/python/README.md

@@ -12,7 +12,7 @@ Pull requests welcome!
     pip install python3-indy
 
 Note that before you can use python wrapper you must install  c-callable SDK. 
-See the section "How-to-install" in [Indy SDK](README.md) 
+See the section "Installing the SDK" in the [Indy SDK documentation](../../README.md#installing-the-sdk) 
 
 ### How to build