From ce5155ebdc26b92eff4326bd1c2c9d8bb60246fe Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 6 Nov 2014 09:00:35 +0100 Subject: [PATCH] Rename BootstrapNode#{LOCAL_HOST => LOCALHOST} --- src/main/java/io/bitsquare/app/cli/SeedNode.java | 5 ++++- src/main/java/io/bitsquare/msg/DefaultMessageModule.java | 2 +- src/main/java/io/bitsquare/network/BootstrapNode.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/bitsquare/app/cli/SeedNode.java b/src/main/java/io/bitsquare/app/cli/SeedNode.java index 8c20e06289..3708813289 100644 --- a/src/main/java/io/bitsquare/app/cli/SeedNode.java +++ b/src/main/java/io/bitsquare/app/cli/SeedNode.java @@ -56,7 +56,10 @@ public class SeedNode { interfaceHint = namespace.getString(ArgumentParser.INTERFACE_HINT_FLAG); int serverPort = Integer.valueOf(namespace.getString(ArgumentParser.PORT_FLAG)); - String seedID = namespace.getString(ArgumentParser.PEER_ID_FLAG); + String seedID = BootstrapNode.LOCALHOST.getId(); + if (namespace.getString(ArgumentParser.PEER_ID_FLAG) != null) { + seedID = namespace.getString(ArgumentParser.PEER_ID_FLAG); + } final Set peerAddresses = new HashSet<>(); for (Node node : BootstrapNode.values()) { diff --git a/src/main/java/io/bitsquare/msg/DefaultMessageModule.java b/src/main/java/io/bitsquare/msg/DefaultMessageModule.java index ddcad87bd3..963c9df001 100644 --- a/src/main/java/io/bitsquare/msg/DefaultMessageModule.java +++ b/src/main/java/io/bitsquare/msg/DefaultMessageModule.java @@ -44,7 +44,7 @@ public class DefaultMessageModule extends AbstractBitsquareModule implements Mes bind(Node.class) .annotatedWith(Names.named("bootstrapNode")) - .toInstance(BootstrapNode.LOCAL_HOST); + .toInstance(BootstrapNode.LOCALHOST); } @Override diff --git a/src/main/java/io/bitsquare/network/BootstrapNode.java b/src/main/java/io/bitsquare/network/BootstrapNode.java index e675f9af3d..14dfd2523b 100644 --- a/src/main/java/io/bitsquare/network/BootstrapNode.java +++ b/src/main/java/io/bitsquare/network/BootstrapNode.java @@ -18,7 +18,7 @@ package io.bitsquare.network; public enum BootstrapNode implements Node { - LOCAL_HOST("localhost", "127.0.0.1", 5000), + LOCALHOST("localhost", "127.0.0.1", 5000), DIGITAL_OCEAN1("digitalocean1.bitsquare.io", "188.226.179.109", 5000); private final String id;