Updates for better peer start handling

Author: mikera

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

@@ -19,8 +19,8 @@ public class RemotePeerMixin extends AMixin {
 	private Integer port;
 
 	@Option(names={"--host"},
-		defaultValue="${env:CONVEX_HOST:-"+Constants.DEFAULT_PEER_HOSTNAME+"}",
-		description="Hostname for remote peer connection. Can specify with CONVEX_HOST. Defaulting to: ${DEFAULT-VALUE}")
+		defaultValue="${env:CONVEX_HOST}",
+		description="Hostname for remote peer connection. Can specify with CONVEX_HOST, or use \"none\" to disable.")
 	private String hostname;
 
 	/**
@@ -48,8 +48,8 @@ public Convex connect()  {
 	}
 
 	public InetSocketAddress getSocketAddress() {
-		if (port==null) port=convex.core.Constants.DEFAULT_PEER_PORT;
-		if (hostname==null) hostname=convex.cli.Constants.DEFAULT_PEER_HOSTNAME;
+		int port= (this.port!=null) ?this.port:convex.core.Constants.DEFAULT_PEER_PORT;
+		String hostname=(this.hostname!=null)?this.hostname:convex.cli.Constants.DEFAULT_PEER_HOSTNAME;
 		InetSocketAddress sa=IPUtils.parseAddress(hostname,port);
 		return sa;
 	}
@@ -60,6 +60,7 @@ public InetSocketAddress getSocketAddress() {
 	 */
 	public InetSocketAddress getSpecifiedSource() {
 		if (hostname==null) return null;
+		if (hostname.trim().equalsIgnoreCase("none")) return null;
 		return getSocketAddress();
 	}
 

convex-cli/src/main/java/convex/cli/peer/PeerStart.java

@@ -172,9 +172,15 @@ public void execute() throws InterruptedException {
 				HashMap<Keyword,Object> config=new HashMap<>();
 				config.put(Keywords.KEYPAIR, peerKey);
 				config.put(Keywords.STORE, store);
-				config.put(Keywords.SOURCE, remoteSource);
 				config.put(Keywords.URL, url);
 				config.put(Keywords.PORT, port);
+				
+				if (remoteSource!=null) {
+					config.put(Keywords.SOURCE, remoteSource); // if remote source to sync with is specified
+				} else {
+					// if no remote host to sync with, assume we want to restore existing peer
+					config.put(Keywords.RESTORE,true);
+				}
 				if (recalc!=null) config.put(Keywords.RECALC, recalc);
 
 				config.put(Keywords.BASE_URL, baseURL);

convex-cli/src/test/java/convex/cli/peer/LocalTest.java

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -22,14 +23,18 @@
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 
+import com.beust.jcommander.Strings;
+
 import convex.api.Convex;
 import convex.api.ConvexRemote;
 import convex.cli.CLTester;
 import convex.cli.ExitCodes;
 import convex.cli.Helpers;
 import convex.core.Result;
 import convex.core.crypto.AKeyPair;
+import convex.core.crypto.BIP39;
 import convex.core.crypto.PFXTools;
+import convex.core.crypto.SLIP10;
 import convex.core.data.Blob;
 import convex.core.data.Blobs;
 import convex.core.util.Utils;
@@ -71,6 +76,9 @@ public static void setupLocalNet() throws IOException, InterruptedException {
 		importTester.assertExitCode(ExitCodes.SUCCESS);
 		assertEquals(expectedKey, importTester.getOutput().trim());
 
+		Blob MASTER_KEY=BIP39.getSeed(bip39, bipPassphrase);
+		AKeyPair GENESIS_KP=SLIP10.deriveKeyPair(MASTER_KEY);
+		assertEquals(expectedKey,GENESIS_KP.getAccountKey().toHexString());
 
 		String javaHome = System.getProperty("java.home");
 		String javaCmd = javaHome + File.separator + "bin" + File.separator + "java";
@@ -99,12 +107,15 @@ public static void setupLocalNet() throws IOException, InterruptedException {
 		ProcessBuilder builder = new ProcessBuilder(cmd);
 		process = builder.start();
 
+		ArrayList<String> outputList=new ArrayList<>();
+		
 		// We need to wait until the peer started message is seen
 		Thread checker = new Thread(() -> {
 			try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
 				try (Scanner s = new Scanner(reader)) {
 					while (true) {
 						String output = s.nextLine();
+						outputList.add(output);
 						// System.err.println(output);
 						if (output.contains("Started: 1")) break;
 					}
@@ -116,7 +127,11 @@ public static void setupLocalNet() throws IOException, InterruptedException {
 		checker.setDaemon(true);
 		checker.start();
 		checker.join(10000);
-		assertTrue(process.isAlive());
+		if (process.isAlive()) {
+			
+		} else {
+			fail("Local network did note start, with output:\n"+Strings.join("\n", outputList));
+		}
 	}
 
 

convex-peer/src/main/java/convex/peer/Server.java

@@ -189,8 +189,13 @@ private Peer establishPeer() throws ConfigException, LaunchException, Interrupte
 					throw new LaunchException("Timeout trying to connect to remote peer");
 				} catch (IllegalArgumentException e) {
 					throw new LaunchException("Bad :SOURCE for peer launch",e);
+				} catch (Exception e ) {
+					// something else failed, probably an IOException
+					throw new LaunchException("Failed to sync with remote peer host at: "+source,e);
 				}
-			} else if (Utils.bool(getConfig().get(Keywords.RESTORE))) {
+			} 
+			
+			if (Utils.bool(getConfig().get(Keywords.RESTORE))) {
 				ACell rk=RT.cvm(config.get(Keywords.ROOT_KEY));
 				if (rk==null) rk=keyPair.getAccountKey();
 
@@ -200,6 +205,7 @@ private Peer establishPeer() throws ConfigException, LaunchException, Interrupte
 					return peer;
 				}
 			} 
+			
 			// No sync or restored state, so use passed state
 			State genesisState = (State) config.get(Keywords.STATE);
 			if (genesisState!=null) {