Reverted demo tests

Signed-off-by: artem.ivanov <[email protected]>

Author: Artemkaaas

wrappers/java/src/test/java/org/hyperledger/indy/sdk/demo/AnoncredsDemoTest.java

@@ -90,8 +90,6 @@ public void testAnoncredsDemo() throws Exception {
 		String credDefId = createCredDefResult.getCredDefId();
 		String credDef = createCredDefResult.getCredDefJson();
 
-		System.out.println(credDef);
-
 		// Prover create Master Secret
 		Anoncreds.proverCreateMasterSecret(proverWallet, masterSecretId).get();
 
@@ -117,41 +115,49 @@ public void testAnoncredsDemo() throws Exception {
 				"                    \"name\":\"proof_req_1\",\n" +
 				"                    \"version\":\"0.1\", " +
 				"                    \"requested_attributes\": {" +
-				"                          \"attr1_referent\":{\"name\":\"name\"}" +
+				"                          \"attr1_referent\":{\"name\":\"name\"}," +
+				"                          \"attr2_referent\":{\"name\":\"sex\"}," +
+				"                          \"attr3_referent\":{\"name\":\"phone\"}" +
 				"                     }," +
 				"                    \"requested_predicates\":{" +
+				"                         \"predicate1_referent\":{\"name\":\"age\",\"p_type\":\">=\",\"p_value\":18}" +
 				"                    }" +
 				"                  }").toString();
 
 		String credentialsForProofJson = Anoncreds.proverGetCredentialsForProofReq(proverWallet, proofRequestJson).get();
 
 		JSONObject credentialsForProof = new JSONObject(credentialsForProofJson);
 		JSONArray credentialsForAttribute1 = credentialsForProof.getJSONObject("attrs").getJSONArray("attr1_referent");
+		JSONArray credentialsForAttribute2 = credentialsForProof.getJSONObject("attrs").getJSONArray("attr2_referent");
+		JSONArray credentialsForAttribute3 = credentialsForProof.getJSONObject("attrs").getJSONArray("attr3_referent");
+		JSONArray credentialsForPredicate = credentialsForProof.getJSONObject("predicates").getJSONArray("predicate1_referent");
 
 		assertEquals(credentialsForAttribute1.length(), 1);
+		assertEquals(credentialsForAttribute2.length(), 1);
+		assertEquals(credentialsForAttribute3.length(), 0);
+		assertEquals(credentialsForPredicate.length(), 1);
 
 		String credentialUuid = credentialsForAttribute1.getJSONObject(0).getJSONObject("cred_info").getString("referent");
 
 		// Prover create Proof
 		String selfAttestedValue = "8-800-300";
 		String requestedCredentialsJson = new JSONObject(String.format("{\n" +
-				"                                          \"self_attested_attributes\":{},\n" +
-				"                                          \"requested_attributes\":{\"attr1_referent\":{\"cred_id\":\"%s\", \"revealed\":true}},\n" +
-				"                                          \"requested_predicates\":{}\n" +
-				"                                        }", credentialUuid)).toString();
+				"                                          \"self_attested_attributes\":{\"attr3_referent\":\"%s\"},\n" +
+				"                                          \"requested_attributes\":{\"attr1_referent\":{\"cred_id\":\"%s\", \"revealed\":true},\n" +
+				"                                                                    \"attr2_referent\":{\"cred_id\":\"%s\", \"revealed\":false}},\n" +
+				"                                          \"requested_predicates\":{\"predicate1_referent\":{\"cred_id\":\"%s\"}}\n" +
+				"                                        }", selfAttestedValue, credentialUuid, credentialUuid, credentialUuid)).toString();
 
 		String schemas = new JSONObject(String.format("{\"%s\":%s}", gvtSchemaId, gvtSchema)).toString();
 		String credentialDefs = new JSONObject(String.format("{\"%s\":%s}", credDefId, credDef)).toString();
 		String revocStates = new JSONObject("{}").toString();
 
 		String proofJson = Anoncreds.proverCreateProof(proverWallet, proofRequestJson, requestedCredentialsJson,
 				masterSecretId, schemas, credentialDefs, revocStates).get();
-
-		System.out.println(proofJson);
 		JSONObject proof = new JSONObject(proofJson);
 
 		// Verifier verify Proof
-		/*JSONObject revealedAttr1 = proof.getJSONObject("requested_proof").getJSONObject("revealed_attrs").getJSONObject("attr1_referent");
+		JSONObject revealedAttr1 = proof.getJSONObject("requested_proof").getJSONObject("revealed_attrs").getJSONObject("attr1_referent");
 		assertEquals("Alex", revealedAttr1.getString("raw"));
 
 		assertNotNull(proof.getJSONObject("requested_proof").getJSONObject("unrevealed_attrs").getJSONObject("attr2_referent").getInt("sub_proof_index"));
@@ -162,7 +168,7 @@ public void testAnoncredsDemo() throws Exception {
 		String revocRegs = new JSONObject("{}").toString();
 
 		Boolean valid = Anoncreds.verifierVerifyProof(proofRequestJson, proofJson, schemas, credentialDefs, revocRegDefs, revocRegs).get();
-		assertTrue(valid);*/
+		assertTrue(valid);
 	}
 
 	@Test
@@ -620,4 +626,4 @@ public void testVerifyProofWorksForProofDoesNotCorrespondToProofRequest() throws
 
 		Anoncreds.verifierVerifyProof(proofRequestJson, proofJson, schemas, credentialDefs, revocRegDefs, revocRegs).get();
 	}
-}
+}

wrappers/python/tests/demo/test_anoncreds.py

@@ -21,14 +21,13 @@ async def test_anoncreds_demo_works(pool_name, wallet_name, path_home, credentia
     (cred_def_id, cred_def_json) = \
         await anoncreds.issuer_create_and_store_credential_def(wallet_handle, issuer_did, schema_json, 'tag1', 'CL',
                                                                '{"support_revocation": false}')
-    print(cred_def_json)
+
     # 3. Prover create Master Secret
     master_secret_id = "master_secret"
     await anoncreds.prover_create_master_secret(wallet_handle, master_secret_id)
 
     # 4. Issuer create credential Offer
     cred_offer_json = await anoncreds.issuer_create_credential_offer(wallet_handle, cred_def_id)
-    print(cred_offer_json)
 
     # 5. Prover create credential Request
     (cred_req_json, cred_req_metadata_json) = \
@@ -60,7 +59,9 @@ async def test_anoncreds_demo_works(pool_name, wallet_name, path_home, credentia
         'requested_attributes': {
             'attr1_referent': {'name': 'name'}
         },
-        'requested_predicates': {}
+        'requested_predicates': {
+            'predicate1_referent': {'name': 'age', 'p_type': '>=', 'p_value': 18}
+        }
     })
 
     credential_for_proof_json = await anoncreds.prover_get_credentials_for_proof_req(wallet_handle, proof_req_json)
@@ -73,7 +74,7 @@ async def test_anoncreds_demo_works(pool_name, wallet_name, path_home, credentia
     requested_credentials_json = json.dumps({
         'self_attested_attributes': {},
         'requested_attributes': {'attr1_referent': {'cred_id': referent, 'revealed': True}},
-        'requested_predicates': {}
+        'requested_predicates': {'predicate1_referent': {'cred_id': referent}}
     })
 
     schemas_json = json.dumps({schema_id: json.loads(schema_json)})
@@ -84,7 +85,6 @@ async def test_anoncreds_demo_works(pool_name, wallet_name, path_home, credentia
                                                      master_secret_id, schemas_json, credential_defs_json,
                                                      revoc_states_json)
     proof = json.loads(proof_json)
-    print(proof_json)
 
     assert 'Alex' == proof['requested_proof']['revealed_attrs']['attr1_referent']['raw']
 
@@ -209,4 +209,4 @@ async def test_anoncreds_demo_works_for_revocation_proof(pool_name, wallet_name,
 
     # 14. Close wallet
     await wallet.close_wallet(wallet_handle)
-    await wallet.delete_wallet(wallet_name, credentials)
+    await wallet.delete_wallet(wallet_name, credentials)