More updates for CLI client commands

Author: mikera

convex-cli/src/main/java/convex/cli/account/AAccountCommand.java

@@ -1,11 +1,7 @@
 package convex.cli.account;
 
-import java.io.IOException;
-import java.util.concurrent.TimeoutException;
-
 import convex.api.Convex;
 import convex.cli.ACommand;
-import convex.cli.CLIError;
 import convex.cli.Main;
 import convex.cli.mixins.RemotePeerMixin;
 import picocli.CommandLine.Mixin;
@@ -20,13 +16,7 @@ public abstract class AAccountCommand extends ACommand {
 	protected RemotePeerMixin peerMixin;
 
 	protected Convex connect() {
-		try {
-			return peerMixin.connect();
-		} catch (IOException e) {
-			throw new CLIError("Unable to connect to Convex network",e);
-		}	catch (TimeoutException e) {
-			throw new CLIError("Timout connecting to Convex network",e);
-		}
+		return peerMixin.connect();
 	}
 
 	@Override

convex-cli/src/main/java/convex/cli/account/AccountBalance.java

@@ -60,7 +60,7 @@ public void run() {
 			Convex convex = peerMixin.connect();
 			String queryCommand = "(balance "+address+")";
 			ACell message = Reader.read(queryCommand);
-			Result result = convex.querySync(message, timeout);
+			Result result = convex.querySync(message);
 			mainParent.printResult(result);
 		} catch (Exception e) {
 			throw new CLIError("Error executing query",e);

convex-cli/src/main/java/convex/cli/account/AccountInformation.java

@@ -64,7 +64,7 @@ public void run() {
 		ACell message = Reader.read(queryCommand);
 		Result result;
 		try {
-			result = convex.querySync(message, timeout);
+			result = convex.querySync(message);
 			mainParent.printResult(result);
 		} catch (TimeoutException e) {
 			throw new CLIError("Timeout",e);

convex-cli/src/main/java/convex/cli/client/AClientCommand.java

@@ -32,21 +32,16 @@ public abstract class AClientCommand extends ATopCommand {
 			description="Timeout in miliseconds.")
 	protected Long timeout;
 
-
 	/**
 	 * Connect as a client to the convex network
 	 * @return
 	 */
 	protected Convex clientConnect() {
-		try {
-			Convex convex= peerMixin.connect();
-			if (timeout!=null) {
-				convex.setTimeout(timeout);
-			}
-			return convex;
-		} catch (Exception ex) {
-			throw new CLIError("Unable to connect to Convex: "+ex.getMessage(),ex);
+		Convex convex= peerMixin.connect();
+		if (timeout!=null) {
+			convex.setTimeout(timeout);
 		}
+		return convex;
 	}
 
 	/**

convex-cli/src/main/java/convex/cli/client/Query.java

@@ -40,7 +40,7 @@ public void run() {
 			Convex convex =  connectQuery();
 			for (int i=0; i<commands.length; i++) {
 				ACell message = Reader.read(commands[i]);
-				Result result = convex.querySync(message, timeout);
+				Result result = convex.querySync(message);
 				printResult(result);
 				if (result.isError()) {
 					break;

convex-cli/src/main/java/convex/cli/mixins/RemotePeerMixin.java

@@ -29,19 +29,21 @@ public class RemotePeerMixin extends AMixin {
 	 * @throws IOException
 	 * @throws TimeoutException
 	 */
-	public convex.api.Convex connect() throws IOException,TimeoutException {
+	public convex.api.Convex connect()  {
 		if (port==null) port=convex.core.Constants.DEFAULT_PEER_PORT;
 		if (hostname==null) hostname=convex.cli.Constants.HOSTNAME_PEER;
+		InetSocketAddress sa=new InetSocketAddress(hostname,port);
 		try {
-			InetSocketAddress sa=new InetSocketAddress(hostname,port);
 			Convex c;
 			c=Convex.connect(sa);
 
 			return c;
 		} catch (ConnectException ce) {
-			throw new CLIError("Cannot connect to: "+hostname+" on port "+port,ce);
+			throw new CLIError("Cannot connect to: "+sa,ce);
 		} catch (TimeoutException e) {
 			throw new CLIError("Timeout while attempting to connect to peer: "+hostname,e);
+		} catch (IOException e) {
+			throw new CLIError("IO Error: "+e.getMessage(),e);
 		}
 	}
 

convex-peer/src/main/java/convex/api/Convex.java

@@ -811,20 +811,6 @@ public Result querySync(String query) throws TimeoutException, IOException {
 		return querySync(form, getAddress());
 	}
 
-	/**
-	 * Executes a query synchronously and waits for the Result
-	 *
-	 * @param timeoutMillis Timeout to wait for query result. Will throw
-	 *                      TimeoutException if not received in this time
-	 * @param query         Query to execute, as a Form or Op
-	 * @return Result of query
-	 * @throws TimeoutException If the synchronous request timed out
-	 * @throws IOException      In case of network error
-	 */
-	public Result querySync(ACell query, long timeoutMillis) throws IOException, TimeoutException {
-		return querySync(query, getAddress(), timeoutMillis);
-	}
-
 	/**
 	 * Executes a query synchronously and waits for the Result
 	 *
@@ -849,7 +835,7 @@ public Result querySync(ACell query, Address address) throws IOException, Timeou
 	 * @throws TimeoutException If the synchronous request timed out
 	 * @throws IOException      In case of network error
 	 */
-	public Result querySync(ACell query, Address address, long timeoutMillis) throws TimeoutException, IOException {
+	protected Result querySync(ACell query, Address address, long timeoutMillis) throws TimeoutException, IOException {
 		Future<Result> cf = query(query, address);
 		Result result;
 		try {

convex-restapi/src/main/java/convex/restapi/api/ChainAPI.java

@@ -56,7 +56,6 @@ public ChainAPI(RESTServer restServer) {
 
     private static final String ROUTE = "/api/v1/";
 
-
 	@Override
 	public void addRoutes(Javalin app) {
 		String prefix=ROUTE;
@@ -171,9 +170,6 @@ public void queryAccount(Context ctx) {
 		}
 
 		boolean isUser=!as.isActor();
-		// TODO: consider if isLibrary is useful?
-		// boolean isLibrary=as.getCallableFunctions().isEmpty();
-		
 
 		HashMap<String,Object> hm=new HashMap<>();
 		hm.put("address",addr.longValue());