From ce208eb0c159bdc0e5609c016c15745072fbe41a Mon Sep 17 00:00:00 2001 From: Justin LeBlanc Date: Tue, 12 Dec 2023 15:09:04 +0000 Subject: [PATCH 1/3] Update README to note you need to setup the environment before you install. --- example/README.md | 5 +++-- rust/{makefile => Makefile} | 0 2 files changed, 3 insertions(+), 2 deletions(-) rename rust/{makefile => Makefile} (100%) diff --git a/example/README.md b/example/README.md index 18eac839..e4996e06 100644 --- a/example/README.md +++ b/example/README.md @@ -15,11 +15,12 @@ Demonstrates how to use the polygonid_flutter_sdk plugin. ### Install 1. Clone the `polygonid-flutter-sdk` repository. 2. Run `flutter pub get` from example directory. -3. Run `build_runner` to generate `.g.dart` files: +3. Configure the environment per the instructions below. +4. Run `build_runner` to generate `.g.dart` files: ```bash dart run build_runner build --delete-conflicting-outputs ``` -4. After the previous steps, build and run the project. +5. After the previous steps, build and run the project. ## Examples diff --git a/rust/makefile b/rust/Makefile similarity index 100% rename from rust/makefile rename to rust/Makefile From 02b396353898face4b2fccd58e5ab0645da198f6 Mon Sep 17 00:00:00 2001 From: Justin LeBlanc Date: Tue, 12 Dec 2023 15:24:56 +0000 Subject: [PATCH 2/3] Add simulator as target in rust Makefile --- rust/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rust/Makefile b/rust/Makefile index d4d3fb62..8617ae80 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -27,8 +27,7 @@ help: makefile ## init: Install missing dependencies. .PHONY: init init: - rustup target add aarch64-apple-ios x86_64-apple-ios - #rustup target add armv7-apple-ios armv7s-apple-ios i386-apple-ios ## deprecated + rustup target add aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-ios rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android @if [ $$(uname) == "Darwin" ] ; then cargo install cargo-lipo ; fi cargo install cbindgen From c5e9c710b9ae2c9ffe9bd20ccfd16fc48ccf195a Mon Sep 17 00:00:00 2001 From: Justin LeBlanc Date: Fri, 15 Dec 2023 10:09:20 +0000 Subject: [PATCH 3/3] PID-1265 - Uncomment filter and fix tests expecting a filter count --- .../data/mappers/proof_request_filters_mapper.dart | 4 ++-- .../mappers/proof_request_filters_mapper_test.dart | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/iden3comm/data/mappers/proof_request_filters_mapper.dart b/lib/iden3comm/data/mappers/proof_request_filters_mapper.dart index a409d404..789a848a 100644 --- a/lib/iden3comm/data/mappers/proof_request_filters_mapper.dart +++ b/lib/iden3comm/data/mappers/proof_request_filters_mapper.dart @@ -21,10 +21,10 @@ class ProofRequestFiltersMapper List filters = [ FilterEntity( name: 'credential.credentialSubject.type', value: query.type!), - /*FilterEntity( + FilterEntity( operator: FilterOperator.equalsAnyInList, name: 'credential.@context', - value: query.context!),*/ + value: query.context!), ]; if (query.allowedIssuers != null && query.allowedIssuers is List && diff --git a/test/iden3comm/data/mappers/proof_request_filters_mapper_test.dart b/test/iden3comm/data/mappers/proof_request_filters_mapper_test.dart index 2432b7c9..25287b43 100644 --- a/test/iden3comm/data/mappers/proof_request_filters_mapper_test.dart +++ b/test/iden3comm/data/mappers/proof_request_filters_mapper_test.dart @@ -202,7 +202,7 @@ main() { test("From ProofRequestEntity to List LT operator", () { List filters = proofRequestFiltersMapper.mapFrom(mockProofRequestEntityLT); - expect(filters.length, 3); + expect(filters.length, 4); expect(filters[0].name, "credential.credentialSubject.type"); expect(filters[0].value, "KYCAgeCredential"); }); @@ -210,7 +210,7 @@ main() { test("From ProofRequestEntity to List GT operator", () { List filters = proofRequestFiltersMapper.mapFrom(mockProofRequestEntityGT); - expect(filters.length, 3); + expect(filters.length, 4); expect(filters[0].name, "credential.credentialSubject.type"); expect(filters[0].value, "KYCAgeCredential"); }); @@ -218,7 +218,7 @@ main() { test("From ProofRequestEntity to List EQ", () { List filters = proofRequestFiltersMapper.mapFrom(mockProofRequestEntityEQ); - expect(filters.length, 3); + expect(filters.length, 4); expect(filters[0].name, "credential.credentialSubject.type"); expect(filters[0].value, "KYCAgeCredential"); }); @@ -226,7 +226,7 @@ main() { test("From ProofRequestEntity to List IN", () { List filters = proofRequestFiltersMapper.mapFrom(mockProofRequestEntityIN); - expect(filters.length, 3); + expect(filters.length, 4); expect(filters[0].name, "credential.credentialSubject.type"); expect(filters[0].value, "KYCAgeCredential"); }); @@ -234,7 +234,7 @@ main() { test("From ProofRequestEntity to List NIN", () { List filters = proofRequestFiltersMapper.mapFrom(mockProofRequestEntityNIN); - expect(filters.length, 4); + expect(filters.length, 5); expect(filters[0].name, "credential.credentialSubject.type"); expect(filters[0].value, "KYCAgeCredential"); }); @@ -244,7 +244,7 @@ main() { () { List filters = proofRequestFiltersMapper.mapFrom(mockProofRequestEntityNINCountry); - expect(filters.length, 6); + expect(filters.length, 7); expect(filters[0].name, "credential.credentialSubject.type"); expect(filters[0].value, "KYCCountryOfResidenceCredential"); }); @@ -253,7 +253,7 @@ main() { () { List filters = proofRequestFiltersMapper .mapFrom(mockProofRequestEntityNotSupportedOperator); - expect(filters.length, 2); + expect(filters.length, 3); expect(filters[0].name, "credential.credentialSubject.type"); expect(filters[0].value, "KYCCountryOfResidenceCredential"); });