Make regtest and localhost default for bootstrap node

This commit is contained in:
Manfred Karrer 2015-05-15 19:05:23 +02:00
parent 27381b0e98
commit 5b7a8e31d0
5 changed files with 7 additions and 12 deletions

View file

@ -45,7 +45,7 @@ public class BootstrapNode {
private static final String VERSION = "0.1.3"; private static final String VERSION = "0.1.3";
public static final String P2P_ID = "node.p2pId"; public static final String P2P_ID = "node.p2pId";
public static int DEFAULT_P2P_ID = 1; // 0 | 1 | 2 for mainnet/testnet/regtest public static int DEFAULT_P2P_ID = 2; // 0 | 1 | 2 for mainnet/testnet/regtest
private static Peer peer = null; private static Peer peer = null;
@ -60,7 +60,7 @@ public class BootstrapNode {
public void start() { public void start() {
int p2pId = env.getProperty(P2P_ID, Integer.class, DEFAULT_P2P_ID); int p2pId = env.getProperty(P2P_ID, Integer.class, DEFAULT_P2P_ID);
int port = env.getProperty(Node.PORT_KEY, Integer.class, BootstrapNodes.BASE_PORT + p2pId); int port = env.getProperty(Node.PORT_KEY, Integer.class, BootstrapNodes.BASE_PORT + p2pId);
String name = env.getRequiredProperty(Node.NAME_KEY); String name = env.getProperty(Node.NAME_KEY, BootstrapNodes.LOCALHOST.getName());
Logging.setup(name + "_" + port); Logging.setup(name + "_" + port);
try { try {

View file

@ -32,9 +32,9 @@ public class BootstrapNodeMain extends BitsquareExecutable {
} }
protected void customizeOptionParsing(OptionParser parser) { protected void customizeOptionParsing(OptionParser parser) {
parser.accepts(Node.NAME_KEY, description("Name of this node", null)) parser.accepts(Node.NAME_KEY, description("Name of this node", BootstrapNodes.LOCALHOST.getName()))
.withRequiredArg() .withRequiredArg()
.isRequired(); .ofType(String.class);
parser.accepts(Node.PORT_KEY, description("Port to listen on", BootstrapNodes.BASE_PORT)) parser.accepts(Node.PORT_KEY, description("Port to listen on", BootstrapNodes.BASE_PORT))
.withRequiredArg() .withRequiredArg()
.ofType(int.class); .ofType(int.class);

View file

@ -28,8 +28,3 @@ $JAVA_HOME/bin/javapackager \
-outfile Bitsquare -outfile Bitsquare
cd package/linux cd package/linux
# TODO: Figure out where LICENSE file goes so distros don't complain about "low quality" packages.
# -BlicenseFile=LICENSE comlains about missing file (Bundler DEB Installer skipped because of a configuration problem: Specified license file is missing.
# Advice to fix: Make sure that references a file in the app resources, and that it is relative to the
# basedir.)

View file

@ -3,7 +3,7 @@
[Setup] [Setup]
AppId={{bitsquare}} AppId={{bitsquare}}
AppName=Bitsquare AppName=Bitsquare
AppVersion=0.1.1 AppVersion=0.2.1
AppVerName=Bitsquare AppVerName=Bitsquare
AppPublisher=Bitsquare AppPublisher=Bitsquare
AppComments=Bitsquare AppComments=Bitsquare

View file

@ -1,6 +1,6 @@
cd ..\..\ cd ..\..\
:: edit iss file -> AppVersion=0.1.1 :: edit iss file -> AppVersion=0.2.1
:: Copy jar file from mac build (1.jar from processed folder) to windows :: Copy jar file from mac build (1.jar from processed folder) to windows
:: edit -> -BappVersion=0.2.1 and -srcfiles :: edit -> -BappVersion=0.2.1 and -srcfiles