Updated iOS wrapper

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

Author: Artemkaaas

Jenkinsfile.ci

@@ -155,7 +155,7 @@ def iosTesting() {
 
                 echo "iOS Test: Running pool"
                 sh "docker rm -f indy_pool || true"
-                sh "docker build -f ci/indy-pool.dockerfile -t indy_pool ci"
+                sh "docker build --build-arg client_ip=0.0.0.0 -f ci/indy-pool.dockerfile -t indy_pool ci"
                 sh "docker run -d --name indy_pool -p 9701-9708:9701-9708 indy_pool"
 
                 setupRust()

wrappers/ios/libindy-pod/Indy-demoTests/Case Tests/Ledger/LedgerSendRequests.mm

@@ -18,10 +18,12 @@ - (void)setUp {
 
     ret = [[PoolUtils sharedInstance] createAndOpenPoolLedgerWithPoolName:[TestUtils pool]
                                                                poolHandle:&poolHandle];
+    XCTAssertEqual(ret.code, Success, @"PoolUtils::createAndOpenPoolLedgerWithPoolName() failed");
 
     ret = [[WalletUtils sharedInstance] createAndOpenWalletWithPoolName:[TestUtils pool]
                                                                   xtype:nil
                                                                  handle:&walletHandle];
+    XCTAssertEqual(ret.code, Success, @"WalletUtils::createAndOpenWalletWithPoolName() failed");
     // Put setup code here. This method is called before the invocation of each test method in the class.
 }
 
@@ -698,7 +700,7 @@ - (void)testGetTxnRequestWorks {
 
     // 3. Build & submit get txn request
     NSDictionary *schemaResponse = [NSDictionary fromString:schemaResponseJson];
-    NSNumber *seqNo = (NSNumber *) schemaResponse[@"result"][@"seqNo"];
+    NSNumber *seqNo = (NSNumber *) schemaResponse[@"result"][@"txnMetadata"][@"seqNo"];
 
     NSString *getTxnRequest;
     ret = [[LedgerUtils sharedInstance] buildGetTxnRequestWithSubmitterDid:myDid
@@ -716,8 +718,8 @@ - (void)testGetTxnRequestWorks {
     NSDictionary *getTxnResponse = [NSDictionary fromString:getTxnResponseJson];
 
     NSDictionary *getTxnSchemaResult = getTxnResponse[@"result"][@"data"];
-    XCTAssertNotNil(getTxnSchemaResult[@"data"], @"getTxnSchemaResult[data] is nil");
-    XCTAssertNotNil(getTxnSchemaResult[@"seqNo"], @"getTxnSchemaResult[seqNo] is nil");
+    XCTAssertNotNil(getTxnSchemaResult[@"txn"][@"data"][@"data"], @"getTxnSchemaResult[data] is nil");
+    XCTAssertNotNil(getTxnSchemaResult[@"txnMetadata"][@"seqNo"], @"getTxnSchemaResult[seqNo] is nil");
 }
 
 // MARK: Pool upgrade

wrappers/ios/libindy-pod/Indy-demoTests/Test Utils/PoolUtils.h

@@ -25,9 +25,6 @@
                                    txnFileData:(NSString *)txnFileData
                                    txnFilePath:(NSString *)txnFilePath;
 
-- (NSString *)createGenesisTxnFileForTestPoolWithInvalidNodesForPoolName:(NSString *)poolName
-                                                             txnFilePath:(NSString *)txnFilePath;
-
 // MARK: - Config
 
 - (NSString *)poolConfigJsonForTxnFilePath:(NSString *)txnFilePath;

wrappers/ios/libindy-pod/Indy-demoTests/Test Utils/PoolUtils.m

@@ -54,18 +54,18 @@ - (NSString *)createGenesisTxnFileForTestPool:(NSString *)poolName
 
     NSString *nodeIp = [TestUtils testPoolIp];
     NSString *node1 = [NSString stringWithFormat:@"{\"reqSignature\":{},\"txn\":{\"data\":{\"data\":{\"alias\":\"Node1\",\"blskey\":\"4N8aUNHSgjQVgkpm8nhNEfDf6txHznoYREg9kirmJrkivgL4oSEimFF6nsQ6M41QvhM2Z33nves5vfSn9n1UwNFJBYtWVnHYMATn76vLuL3zU88KyeAYcHfsih3He6UHcXDxcaecHVz6jhCYz1P2UZn2bDVruL5wXpehgBfBaLKm3Ba\",\"client_ip\":\"%@\",\"client_port\":9702,\"node_ip\":\"%@\",\"node_port\":9701,\"services\":[\"VALIDATOR\"]},\"dest\":\"Gw6pDLhcBcoQesN72qfotTgFa7cbuqZpkX3Xo6pLhPhv\"},\"metadata\":{\"from\":\"Th7MpTaRZVRYnPiabds81Y\"},\"type\":\"0\"},\"txnMetadata\":{\"seqNo\":1,\"txnId\":\"fea82e10e894419fe2bea7d96296a6d46f50f93f9eeda954ec461b2ed2950b62\"},\"ver\":\"1\"}", nodeIp, nodeIp];
-    
+
     NSString *node2 = [NSString stringWithFormat:@"{\"reqSignature\":{},\"txn\":{\"data\":{\"data\":{\"alias\":\"Node2\",\"blskey\":\"37rAPpXVoxzKhz7d9gkUe52XuXryuLXoM6P6LbWDB7LSbG62Lsb33sfG7zqS8TK1MXwuCHj1FKNzVpsnafmqLG1vXN88rt38mNFs9TENzm4QHdBzsvCuoBnPH7rpYYDo9DZNJePaDvRvqJKByCabubJz3XXKbEeshzpz4Ma5QYpJqjk\",\"client_ip\":\"%@\",\"client_port\":9704,\"node_ip\":\"%@\",\"node_port\":9703,\"services\":[\"VALIDATOR\"]},\"dest\":\"8ECVSk179mjsjKRLWiQtssMLgp6EPhWXtaYyStWPSGAb\"},\"metadata\":{\"from\":\"EbP4aYNeTHL6q385GuVpRV\"},\"type\":\"0\"},\"txnMetadata\":{\"seqNo\":2,\"txnId\":\"1ac8aece2a18ced660fef8694b61aac3af08ba875ce3026a160acbc3a3af35fc\"},\"ver\":\"1\"}", nodeIp, nodeIp];
-    
+
     NSString *node3 = [NSString stringWithFormat:@"{\"reqSignature\":{},\"txn\":{\"data\":{\"data\":{\"alias\":\"Node3\",\"blskey\":\"3WFpdbg7C5cnLYZwFZevJqhubkFALBfCBBok15GdrKMUhUjGsk3jV6QKj6MZgEubF7oqCafxNdkm7eswgA4sdKTRc82tLGzZBd6vNqU8dupzup6uYUf32KTHTPQbuUM8Yk4QFXjEf2Usu2TJcNkdgpyeUSX42u5LqdDDpNSWUK5deC5\",\"client_ip\":\"%@\",\"client_port\":9706,\"node_ip\":\"%@\",\"node_port\":9705,\"services\":[\"VALIDATOR\"]},\"dest\":\"DKVxG2fXXTU8yT5N7hGEbXB3dfdAnYv1JczDUHpmDxya\"},\"metadata\":{\"from\":\"4cU41vWW82ArfxJxHkzXPG\"},\"type\":\"0\"},\"txnMetadata\":{\"seqNo\":3,\"txnId\":\"7e9f355dffa78ed24668f0e0e369fd8c224076571c51e2ea8be5f26479edebe4\"},\"ver\":\"1\"}", nodeIp, nodeIp];
-    
+
     NSString *node4 = [NSString stringWithFormat:@"{\"reqSignature\":{},\"txn\":{\"data\":{\"data\":{\"alias\":\"Node4\",\"blskey\":\"2zN3bHM1m4rLz54MJHYSwvqzPchYp8jkHswveCLAEJVcX6Mm1wHQD1SkPYMzUDTZvWvhuE6VNAkK3KxVeEmsanSmvjVkReDeBEMxeDaayjcZjFGPydyey1qxBHmTvAnBKoPydvuTAqx5f7YNNRAdeLmUi99gERUU7TD8KfAa6MpQ9bw\",\"client_ip\":\"%@\",\"client_port\":9708,\"node_ip\":\"%@\",\"node_port\":9707,\"services\":[\"VALIDATOR\"]},\"dest\":\"4PS3EDQ3dW1tci1Bp6543CfuuebjFrg36kLAUcskGfaA\"},\"metadata\":{\"from\":\"TWwCRQRZ2ZHMJFn9TzLp7W\"},\"type\":\"0\"},\"txnMetadata\":{\"seqNo\":4,\"txnId\":\"aa5e817d7cc626170eca175822029339a444eb0ee8f0bd20d3b0b76e566fb008\"},\"ver\":\"1\"}", nodeIp, nodeIp];
-    
+
     NSArray *nodesArray = [NSArray arrayWithObjects:node1, node2, node3, node4, nil];
     NSArray *requiredNodes = [nodesArray subarrayWithRange:NSMakeRange(0, nodes)];
-   
+
     NSString *genesisTXNs = [requiredNodes componentsJoinedByString:@"\n"];
-    
+
     return [self createGenesisTxnFileWithPoolName:poolName
                                       txnFileData:genesisTXNs
                                       txnFilePath:txnFilePath];
@@ -100,27 +100,6 @@ - (NSString *)createGenesisTxnFileWithPoolName:(NSString *)poolName
 }
 
 
-- (NSString *)createGenesisTxnFileForTestPoolWithInvalidNodesForPoolName:(NSString *)poolName
-                                                             txnFilePath:(NSString *)txnFilePath
-{
-    NSString *testPoolIp = [TestUtils testPoolIp];
-
-    NSString *node1 = [NSString stringWithFormat:@"{\"reqSignature\":{},\"txn\":{\"data\":{\"data\":{\"alias\":\"Node1\",\"blskey\":\"4N8aUNHSgjQVgkpm8nhNEfDf6txHznoYREg9kirmJrkivgL4oSEimFF6nsQ6M41QvhM2Z33nves5vfSn9n1UwNFJBYtWVnHYMATn76vLuL3zU88KyeAYcHfsih3He6UHcXDxcaecHVz6jhCYz1P2UZn2bDVruL5wXpehgBfBaLKm3Ba\",\"client_ip\":\"%@\",\"client_port\":9702,\"node_ip\":\"%@\",\"node_port\":9701,\"services\":[\"VALIDATOR\"]},\"dest\":\"Gw6pDLhcBcoQesN72qfotTgFa7cbuqZpkX3Xo6pLhPhv\"},\"metadata\":{\"from\":\"Th7MpTaRZVRYnPiabds81Y\"},\"type\":\"0\"},\"txnMetadata\":{\"seqNo\":1,\"txnId\":\"fea82e10e894419fe2bea7d96296a6d46f50f93f9eeda954ec461b2ed2950b62\"},\"ver\":\"1\"}", nodeIp, nodeIp];
-
-    NSString *node2 = [NSString stringWithFormat:@"{\"reqSignature\":{},\"txn\":{\"data\":{\"data\":{\"alias\":\"Node2\",\"blskey\":\"37rAPpXVoxzKhz7d9gkUe52XuXryuLXoM6P6LbWDB7LSbG62Lsb33sfG7zqS8TK1MXwuCHj1FKNzVpsnafmqLG1vXN88rt38mNFs9TENzm4QHdBzsvCuoBnPH7rpYYDo9DZNJePaDvRvqJKByCabubJz3XXKbEeshzpz4Ma5QYpJqjk\",\"client_ip\":\"%@\",\"client_port\":9704,\"node_ip\":\"%@\",\"node_port\":9703,\"services\":[\"VALIDATOR\"]},\"dest\":\"8ECVSk179mjsjKRLWiQtssMLgp6EPhWXtaYyStWPSGAb\"},\"metadata\":{\"from\":\"EbP4aYNeTHL6q385GuVpRV\"},\"type\":\"0\"},\"txnMetadata\":{\"seqNo\":2,\"txnId\":\"1ac8aece2a18ced660fef8694b61aac3af08ba875ce3026a160acbc3a3af35fc\"},\"ver\":\"1\"}", nodeIp, nodeIp];
-
-    NSString *node3 = [NSString stringWithFormat:@"{\"reqSignature\":{},\"txn\":{\"data\":{\"data\":{\"alias\":\"Node3\",\"blskey\":\"3WFpdbg7C5cnLYZwFZevJqhubkFALBfCBBok15GdrKMUhUjGsk3jV6QKj6MZgEubF7oqCafxNdkm7eswgA4sdKTRc82tLGzZBd6vNqU8dupzup6uYUf32KTHTPQbuUM8Yk4QFXjEf2Usu2TJcNkdgpyeUSX42u5LqdDDpNSWUK5deC5\",\"client_ip\":\"%@\",\"client_port\":9706,\"node_ip\":\"%@\",\"node_port\":9705,\"services\":[\"VALIDATOR\"]},\"dest\":\"DKVxG2fXXTU8yT5N7hGEbXB3dfdAnYv1JczDUHpmDxya\"},\"metadata\":{\"from\":\"4cU41vWW82ArfxJxHkzXPG\"},\"type\":\"0\"},\"txnMetadata\":{\"seqNo\":3,\"txnId\":\"7e9f355dffa78ed24668f0e0e369fd8c224076571c51e2ea8be5f26479edebe4\"},\"ver\":\"1\"}", nodeIp, nodeIp];
-
-    NSString *node4 = [NSString stringWithFormat:@"{\"reqSignature\":{},\"txn\":{\"data\":{\"data\":{\"alias\":\"WRONG_ALIAS\",\"blskey\":\"2zN3bHM1m4rLz54MJHYSwvqzPchYp8jkHswveCLAEJVcX6Mm1wHQD1SkPYMzUDTZvWvhuE6VNAkK3KxVeEmsanSmvjVkReDeBEMxeDaayjcZjFGPydyey1qxBHmTvAnBKoPydvuTAqx5f7YNNRAdeLmUi99gERUU7TD8KfAa6MpQ9bw\",\"client_ip\":\"%@\",\"client_port\":9708,\"node_ip\":\"%@\",\"node_port\":9707,\"services\":[\"VALIDATOR\"]},\"dest\":\"4PS3EDQ3dW1tci1Bp6543CfuuebjFrg36kLAUcskGfaA\"},\"metadata\":{\"from\":\"TWwCRQRZ2ZHMJFn9TzLp7W\"},\"type\":\"0\"},\"txnMetadata\":{\"seqNo\":4,\"txnId\":\"aa5e817d7cc626170eca175822029339a444eb0ee8f0bd20d3b0b76e566fb008\"},\"ver\":\"1\"}", nodeIp, nodeIp];
-    
-    NSString *genesisTXNs = [NSString stringWithFormat: @"%@\n%@\n%@\n%@\n", node1, node2, node3, node4];
-    
-    return [self createGenesisTxnFileWithPoolName:poolName
-                                      txnFileData:genesisTXNs
-                                      txnFilePath:txnFilePath];
-    
-}
-
 // MARK: - Config
 
 // Note that to be config valid it assumes genesis txt file is already exists