Added missing grant command for assets

Jagrut Kosti · Jagrut Kosti · commit 3892481256b7 · 2017-07-12T20:07:56.000+09:00
diff --git a/src/main/java/multichain/command/GrantCommand.java b/src/main/java/multichain/command/GrantCommand.java
@@ -171,6 +171,20 @@ public static String grantFrom(String addressFrom, String address, int permissio
 		return executeGrantFrom(addressFrom, address, permissions);
 	}
 
+	/**
+	 * Grants permissions to addresses From an address
+	 * grantfrom "from-address"  "to-address(es)"  "permission(s)" ( native-amount "comment" "comment-to" startblock endblock )
+	 *
+	 * @param addressFrom address from which to grant permission (should have admin rights)
+	 * @param address address to which the permission should be granted
+	 * @param assetPermission asset permission in the format: assetName.permission e.g. rootStream.write. Possible values are write, admin and issue for assets
+	 * @return transaction ID
+	 * @throws MultichainException
+	 */
+	public static String grantFrom(String addressFrom, String address, String assetPermission) throws MultichainException {
+		return executeGrantFrom(addressFrom, address, assetPermission);
+	}
+
 	/**
 	 * listpermissions ("permission(s)" "address" verbose)
 	 *
diff --git a/src/main/java/multichain/command/builders/QueryBuilderGrant.java b/src/main/java/multichain/command/builders/QueryBuilderGrant.java
@@ -173,6 +173,23 @@ protected static String executeGrantFrom(String addressFrom, String address, int
 		return execute(CommandEnum.GRANTFROM, formatJson(addressFrom), formatJson(address), formatJson(permissionsFormated));
 	}
 
+	/**
+	 * Grants permissions to addresses From an address
+	 * grantfrom "from-address"  "to-address(es)"  "permission(s)" ( native-amount "comment" "comment-to" startblock endblock )
+	 *
+	 * @param addressFrom address from which to grant permission (should have admin rights)
+	 * @param address address to which the permission should be granted
+	 * @param assetPermission asset permission in the format: assetName.permission e.g. rootStream.write. Possible values are write, admin and issue for assets
+	 * @return transaction ID
+	 * @throws MultichainException
+	 */
+	protected static String executeGrantFrom(String addressFrom, String address, String assetPermission) throws MultichainException {
+		MultichainTestParameter.isNotNullOrEmpty("addressFrom", addressFrom);
+		MultichainTestParameter.isNotNullOrEmpty("address", address);
+		MultichainTestParameter.isNotNullOrEmpty("assetPermission", assetPermission);
+
+		return execute(CommandEnum.GRANTFROM, addressFrom, address, assetPermission);
+	}
 	/**
 	 *
 	 * listpermissions ("permission(s)" "address" verbose)
@@ -215,7 +232,10 @@ protected static String executeListPermissions(int permissions, String address,
 	 * @throws MultichainException
 	 */
 	protected static String executeListPermissions(String streamPermission, String address, boolean verbose) throws MultichainException {
-		return execute(CommandEnum.LISTPERMISSIONS, streamPermission, address, formatJson(verbose));
+		if (address != null && !address.isEmpty())
+			return execute(CommandEnum.LISTPERMISSIONS, streamPermission, address, formatJson(verbose));
+		else
+			return execute(CommandEnum.LISTPERMISSIONS, streamPermission);
 	}
 
 	/**
