Merge pull request #2335 from ianco/rc

Merge latest master, including indy node dockerfile updates

Author: jovfer

ci/indy-pool.dockerfile

@@ -30,13 +30,19 @@ ARG indy_node_ver=1.12.1~dev1172
 ARG python3_indy_crypto_ver=0.4.5
 ARG indy_crypto_ver=0.4.5
 ARG python3_pyzmq_ver=18.1.0
+ARG python3_orderedset_ver=2.0
+ARG python3_psutil_ver=5.4.3
+ARG python3_pympler_ver=0.5
 
 RUN apt-get update -y && apt-get install -y \
         python3-pyzmq=${python3_pyzmq_ver} \
         indy-plenum=${indy_plenum_ver} \
         indy-node=${indy_node_ver} \
         python3-indy-crypto=${python3_indy_crypto_ver} \
         libindy-crypto=${indy_crypto_ver} \
+        python3-orderedset=${python3_orderedset_ver} \
+        python3-psutil=${python3_psutil_ver} \
+        python3-pympler=${python3_pympler_ver} \
         vim
 
 RUN echo "[supervisord]\n\

wrappers/java/src/main/java/org/hyperledger/indy/sdk/LibIndy.java

@@ -31,6 +31,7 @@ public interface API extends Library {
 		public int indy_close_pool_ledger(int command_handle, int handle, Callback cb);
 		public int indy_delete_pool_ledger_config(int command_handle, String config_name, Callback cb);
 		public int indy_set_protocol_version(int command_handle, int protocol_version, Callback cb);
+		public int indy_list_pools(int command_handle, Callback cb);
 
 		// wallet.rs
 

wrappers/java/src/main/java/org/hyperledger/indy/sdk/pool/Pool.java

@@ -73,6 +73,22 @@ public void callback(int xcommand_handle, int err) {
 			future.complete(result);
 		}
 	};
+
+	/**
+	 * Callback used when listPools completes.
+	 */
+	private static Callback listPoolsCb = new Callback() {
+
+		@SuppressWarnings({"unused", "unchecked"})
+		public void callback(int xcommand_handle, int err, String metadata) {
+
+			CompletableFuture<String> future = (CompletableFuture<String>) removeFuture(xcommand_handle);
+			if (! checkResult(future, err)) return;
+
+			String result = metadata;
+			future.complete(result);
+		}
+	};
 
 	/*
 	 * STATIC METHODS
@@ -259,6 +275,28 @@ public static CompletableFuture<Void> setProtocolVersion(
 		return future;
 	}
 
+	/**
+	 * Lists names of created pool ledgers
+	 *
+	 * @return A future resolving to a list of pools: [{
+	 *     "pool": string - Name of pool ledger stored in the wallet.
+	 *   }]
+	 * @throws IndyException Thrown if an error occurs when calling the underlying SDK.
+	 */
+	public static CompletableFuture<String> listPools() throws IndyException {
+
+		CompletableFuture<String> future = new CompletableFuture<String>();
+		int commandHandle = addFuture(future);
+
+		int result = LibIndy.api.indy_list_pools(
+				commandHandle,
+				listPoolsCb);
+
+		checkResult(future, result);
+
+		return future;
+	}
+
 	/*
 	 * INSTANCE METHODS
 	 */

wrappers/java/src/test/java/org/hyperledger/indy/sdk/pool/ListPoolsTest.java

@@ -0,0 +1,34 @@
+package org.hyperledger.indy.sdk.pool;
+
+import org.hyperledger.indy.sdk.IndyIntegrationTest;
+import org.hyperledger.indy.sdk.utils.PoolUtils;
+
+import org.junit.Test;
+import org.json.JSONArray;
+
+import java.io.File;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+public class ListPoolsTest extends IndyIntegrationTest {
+
+    @Test
+    public void testListPoolsWorks() throws Exception {
+        File file = new File("testListPoolsWorks.txn");
+        file.deleteOnExit();
+        assertTrue(file.createNewFile());
+        PoolUtils.writeTransactions(file);
+
+        String testPoolName = "testListPoolsWorks";
+
+        Pool.createPoolLedgerConfig(testPoolName, null).get();
+        String listPoolsJson = Pool.listPools().get();
+
+        JSONArray listPools = new JSONArray(listPoolsJson);
+
+        assertEquals(1, listPools.length());
+        assertEquals(testPoolName, listPools.getJSONObject(0).getString("pool"));
+    }
+
+}