Refactor option keys

common/src/main/java/io/bitsquare/app/DevFlags.java

@@ -7,5 +7,5 @@ public class DevFlags {
     private static final Logger log = LoggerFactory.getLogger(DevFlags.class);
 
     public static final boolean STRESS_TEST_MODE = false;
-    public static final boolean DEV_MODE = STRESS_TEST_MODE || false;
+    public static final boolean DEV_MODE = STRESS_TEST_MODE || true;
 }

core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java

@@ -53,11 +53,6 @@ public class BitsquareEnvironment extends StandardEnvironment {
     private static final Logger log = LoggerFactory.getLogger(BitsquareEnvironment.class);
 
     private static final String BITCOIN_NETWORK_PROP = "bitcoinNetwork.properties";
-    public static final String USER_DATA_DIR_KEY = "userDataDir";
-
-    public static final String DEFAULT_USER_DATA_DIR = defaultUserDataDir();
-
-    public static final String APP_NAME_KEY = "appName";
 
     public static void setDefaultAppName(String defaultAppName) {
         DEFAULT_APP_NAME = defaultAppName;
@@ -65,7 +60,7 @@ public class BitsquareEnvironment extends StandardEnvironment {
 
     public static String DEFAULT_APP_NAME = "Bitsquare";
 
-    public static final String APP_DATA_DIR_KEY = "appDataDir";
+    public static final String DEFAULT_USER_DATA_DIR = defaultUserDataDir();
     public static final String DEFAULT_APP_DATA_DIR = appDataDir(DEFAULT_USER_DATA_DIR, DEFAULT_APP_NAME);
 
     public static final String LOG_LEVEL_DEFAULT = (DevFlags.STRESS_TEST_MODE || DevFlags.DEV_MODE) ? Level.TRACE.levelStr : Level.WARN.levelStr;
@@ -125,22 +120,28 @@ public class BitsquareEnvironment extends StandardEnvironment {
     }
 
     protected BitsquareEnvironment(PropertySource commandLineProperties) {
-        userDataDir = commandLineProperties.containsProperty(USER_DATA_DIR_KEY) ?
-                (String) commandLineProperties.getProperty(USER_DATA_DIR_KEY) :
-                DEFAULT_USER_DATA_DIR;
-
-        appName = commandLineProperties.containsProperty(APP_NAME_KEY) ?
-                (String) commandLineProperties.getProperty(APP_NAME_KEY) :
-                DEFAULT_APP_NAME;
-
-        appDataDir = commandLineProperties.containsProperty(APP_DATA_DIR_KEY) ?
-                (String) commandLineProperties.getProperty(APP_DATA_DIR_KEY) :
-                appDataDir(userDataDir, appName);
-
         logLevel = commandLineProperties.containsProperty(CommonOptionKeys.LOG_LEVEL_KEY) ?
                 (String) commandLineProperties.getProperty(CommonOptionKeys.LOG_LEVEL_KEY) :
                 LOG_LEVEL_DEFAULT;
 
+        userDataDir = commandLineProperties.containsProperty(CoreOptionKeys.USER_DATA_DIR_KEY) ?
+                (String) commandLineProperties.getProperty(CoreOptionKeys.USER_DATA_DIR_KEY) :
+                DEFAULT_USER_DATA_DIR;
+
+        appName = commandLineProperties.containsProperty(CoreOptionKeys.APP_NAME_KEY) ?
+                (String) commandLineProperties.getProperty(CoreOptionKeys.APP_NAME_KEY) :
+                DEFAULT_APP_NAME;
+
+        appDataDir = commandLineProperties.containsProperty(CoreOptionKeys.APP_DATA_DIR_KEY) ?
+                (String) commandLineProperties.getProperty(CoreOptionKeys.APP_DATA_DIR_KEY) :
+                appDataDir(userDataDir, appName);
+        ignoreDevMsg = commandLineProperties.containsProperty(CoreOptionKeys.IGNORE_DEV_MSG_KEY) ?
+                (String) commandLineProperties.getProperty(CoreOptionKeys.IGNORE_DEV_MSG_KEY) :
+                "";
+        dumpStatistics = commandLineProperties.containsProperty(CoreOptionKeys.DUMP_STATISTICS) ?
+                (String) commandLineProperties.getProperty(CoreOptionKeys.DUMP_STATISTICS) :
+                "";
+
         seedNodes = commandLineProperties.containsProperty(NetworkOptionKeys.SEED_NODES_KEY) ?
                 (String) commandLineProperties.getProperty(NetworkOptionKeys.SEED_NODES_KEY) :
                 "";
@@ -152,10 +153,6 @@ public class BitsquareEnvironment extends StandardEnvironment {
                 (String) commandLineProperties.getProperty(NetworkOptionKeys.BAN_LIST) :
                 "";
 
-        ignoreDevMsg = commandLineProperties.containsProperty(CoreOptionKeys.IGNORE_DEV_MSG_KEY) ?
-                (String) commandLineProperties.getProperty(CoreOptionKeys.IGNORE_DEV_MSG_KEY) :
-                "";
-
         btcSeedNodes = commandLineProperties.containsProperty(BtcOptionKeys.BTC_SEED_NODES) ?
                 (String) commandLineProperties.getProperty(BtcOptionKeys.BTC_SEED_NODES) :
                 "";
@@ -164,11 +161,6 @@ public class BitsquareEnvironment extends StandardEnvironment {
                 (String) commandLineProperties.getProperty(BtcOptionKeys.USE_TOR_FOR_BTC) :
                 "";
 
-        dumpStatistics = commandLineProperties.containsProperty(CoreOptionKeys.DUMP_STATISTICS) ?
-                (String) commandLineProperties.getProperty(CoreOptionKeys.DUMP_STATISTICS) :
-                "";
-
-
         MutablePropertySources propertySources = this.getPropertySources();
         propertySources.addFirst(commandLineProperties);
         try {
@@ -223,31 +215,28 @@ public class BitsquareEnvironment extends StandardEnvironment {
             private static final long serialVersionUID = -8478089705207326165L;
 
             {
-                setProperty(APP_DATA_DIR_KEY, appDataDir);
                 setProperty(CommonOptionKeys.LOG_LEVEL_KEY, logLevel);
 
+                setProperty(CoreOptionKeys.APP_DATA_DIR_KEY, appDataDir);
+                setProperty(CoreOptionKeys.IGNORE_DEV_MSG_KEY, ignoreDevMsg);
+                setProperty(CoreOptionKeys.DUMP_STATISTICS, dumpStatistics);
+                setProperty(CoreOptionKeys.APP_NAME_KEY, appName);
+                setProperty(CoreOptionKeys.USER_DATA_DIR_KEY, userDataDir);
+
                 setProperty(NetworkOptionKeys.SEED_NODES_KEY, seedNodes);
                 setProperty(NetworkOptionKeys.MY_ADDRESS, myAddress);
                 setProperty(NetworkOptionKeys.BAN_LIST, banList);
-                setProperty(CoreOptionKeys.IGNORE_DEV_MSG_KEY, ignoreDevMsg);
+                setProperty(NetworkOptionKeys.TOR_DIR, Paths.get(btcNetworkDir, "tor").toString());
-                setProperty(CoreOptionKeys.DUMP_STATISTICS, dumpStatistics);
+                setProperty(NetworkOptionKeys.NETWORK_ID, String.valueOf(bitcoinNetwork.ordinal()));
 
                 setProperty(BtcOptionKeys.BTC_SEED_NODES, btcSeedNodes);
                 setProperty(BtcOptionKeys.USE_TOR_FOR_BTC, useTorForBtc);
 
-                setProperty(APP_NAME_KEY, appName);
-                setProperty(USER_DATA_DIR_KEY, userDataDir);
-
                 setProperty(UserAgent.NAME_KEY, appName);
                 setProperty(UserAgent.VERSION_KEY, Version.VERSION);
-
                 setProperty(WalletService.DIR_KEY, btcNetworkDir);
-
                 setProperty(Storage.DIR_KEY, Paths.get(btcNetworkDir, "db").toString());
                 setProperty(KeyStorage.DIR_KEY, Paths.get(btcNetworkDir, "keys").toString());
-                setProperty(NetworkOptionKeys.TOR_DIR, Paths.get(btcNetworkDir, "tor").toString());
-
-                setProperty(NetworkOptionKeys.NETWORK_ID, String.valueOf(bitcoinNetwork.ordinal()));
             }
         });
     }

core/src/main/java/io/bitsquare/app/BitsquareExecutable.java

@@ -70,11 +70,11 @@ public abstract class BitsquareExecutable {
     }
 
     protected void customizeOptionParsing(OptionParser parser) {
-        parser.accepts(USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
+        parser.accepts(CoreOptionKeys.USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
                 .withRequiredArg();
-        parser.accepts(APP_NAME_KEY, description("Application name", DEFAULT_APP_NAME))
+        parser.accepts(CoreOptionKeys.APP_NAME_KEY, description("Application name", DEFAULT_APP_NAME))
                 .withRequiredArg();
-        parser.accepts(APP_DATA_DIR_KEY, description("Application data directory", DEFAULT_APP_DATA_DIR))
+        parser.accepts(CoreOptionKeys.APP_DATA_DIR_KEY, description("Application data directory", DEFAULT_APP_DATA_DIR))
                 .withRequiredArg();
         parser.accepts(CommonOptionKeys.LOG_LEVEL_KEY, description("Log level [OFF, ALL, ERROR, WARN, INFO, DEBUG, TRACE]", LOG_LEVEL_DEFAULT))
                 .withRequiredArg();

core/src/main/java/io/bitsquare/app/CoreOptionKeys.java

@@ -3,4 +3,7 @@ package io.bitsquare.app;
 public class CoreOptionKeys {
     public static final String IGNORE_DEV_MSG_KEY = "ignoreDevMsg";
     public static final String DUMP_STATISTICS = "dumpStatistics";
+    public static final String USER_DATA_DIR_KEY = "userDataDir";
+    public static final String APP_NAME_KEY = "appName";
+    public static final String APP_DATA_DIR_KEY = "appDataDir";
 }

gui/src/main/java/io/bitsquare/app/BitsquareApp.java

@@ -77,7 +77,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static io.bitsquare.app.BitsquareEnvironment.APP_NAME_KEY;
+import static io.bitsquare.app.CoreOptionKeys.APP_NAME_KEY;
 
 public class BitsquareApp extends Application {
     private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BitsquareApp.class);
@@ -104,7 +104,7 @@ public class BitsquareApp extends Application {
     public void start(Stage stage) throws IOException {
         BitsquareApp.primaryStage = stage;
 
-        String logPath = Paths.get(env.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY), "bitsquare").toString();
+        String logPath = Paths.get(env.getProperty(CoreOptionKeys.APP_DATA_DIR_KEY), "bitsquare").toString();
         Log.setup(logPath);
         log.info("Log files under: " + logPath);
         Version.printVersion();

gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java

@@ -23,7 +23,8 @@ import joptsimple.OptionSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static io.bitsquare.app.BitsquareEnvironment.*;
+import static io.bitsquare.app.BitsquareEnvironment.DEFAULT_APP_NAME;
+import static io.bitsquare.app.BitsquareEnvironment.DEFAULT_USER_DATA_DIR;
 
 public class BitsquareAppMain extends BitsquareExecutable {
     private static final Logger log = LoggerFactory.getLogger(BitsquareAppMain.class);
@@ -33,9 +34,9 @@ public class BitsquareAppMain extends BitsquareExecutable {
         // So we only handle the absolute minimum which is APP_NAME, APP_DATA_DIR_KEY and USER_DATA_DIR
         OptionParser parser = new OptionParser();
         parser.allowsUnrecognizedOptions();
-        parser.accepts(USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
+        parser.accepts(CoreOptionKeys.USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
                 .withRequiredArg();
-        parser.accepts(APP_NAME_KEY, description("Application name", DEFAULT_APP_NAME))
+        parser.accepts(CoreOptionKeys.APP_NAME_KEY, description("Application name", DEFAULT_APP_NAME))
                 .withRequiredArg();
 
         OptionSet options;
@@ -51,7 +52,7 @@ public class BitsquareAppMain extends BitsquareExecutable {
         BitsquareEnvironment bitsquareEnvironment = new BitsquareEnvironment(options);
 
         // need to call that before BitsquareAppMain().execute(args)
-        BitsquareExecutable.initAppDir(bitsquareEnvironment.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY));
+        BitsquareExecutable.initAppDir(bitsquareEnvironment.getProperty(CoreOptionKeys.APP_DATA_DIR_KEY));
 
         // For some reason the JavaFX launch process results in us losing the thread context class loader: reset it.
         // In order to work around a bug in JavaFX 8u25 and below, you must include the following code as the first line of your realMain method:

gui/src/main/java/io/bitsquare/gui/GuiModule.java

@@ -20,7 +20,7 @@ package io.bitsquare.gui;
 import com.google.inject.Singleton;
 import com.google.inject.name.Names;
 import io.bitsquare.app.AppModule;
-import io.bitsquare.app.BitsquareEnvironment;
+import io.bitsquare.app.CoreOptionKeys;
 import io.bitsquare.gui.common.fxml.FxmlViewLoader;
 import io.bitsquare.gui.common.view.CachingViewLoader;
 import io.bitsquare.gui.common.view.ViewFactory;
@@ -69,6 +69,6 @@ public class GuiModule extends AppModule {
 
         bind(Stage.class).toInstance(primaryStage);
 
-        bindConstant().annotatedWith(Names.named(MainView.TITLE_KEY)).to(env.getRequiredProperty(BitsquareEnvironment.APP_NAME_KEY));
+        bindConstant().annotatedWith(Names.named(MainView.TITLE_KEY)).to(env.getRequiredProperty(CoreOptionKeys.APP_NAME_KEY));
     }
 }

gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java

@@ -18,6 +18,7 @@
 package io.bitsquare.gui.main.account.content.backup;
 
 import io.bitsquare.app.BitsquareEnvironment;
+import io.bitsquare.app.CoreOptionKeys;
 import io.bitsquare.common.util.Tuple3;
 import io.bitsquare.common.util.Utilities;
 import io.bitsquare.gui.common.view.ActivatableView;
@@ -62,7 +63,7 @@ public class BackupView extends ActivatableView<GridPane, Void> {
         super();
         this.stage = stage;
         this.preferences = preferences;
-        dataDir = new File(environment.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY));
+        dataDir = new File(environment.getProperty(CoreOptionKeys.APP_DATA_DIR_KEY));
     }
 
     @Override

headless/src/main/java/io/bitsquare/headless/Headless.java

@@ -4,6 +4,7 @@ import ch.qos.logback.classic.Level;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import io.bitsquare.app.BitsquareEnvironment;
+import io.bitsquare.app.CoreOptionKeys;
 import io.bitsquare.app.Log;
 import io.bitsquare.app.Version;
 import io.bitsquare.arbitration.ArbitratorManager;
@@ -41,7 +42,7 @@ public class Headless {
     }
 
     public Headless() {
-        String logPath = Paths.get(env.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY), "bitsquare").toString();
+        String logPath = Paths.get(env.getProperty(CoreOptionKeys.APP_DATA_DIR_KEY), "bitsquare").toString();
         Log.setup(logPath);
         log.info("Log files under: " + logPath);
         Version.printVersion();

headless/src/main/java/io/bitsquare/headless/HeadlessMain.java

@@ -20,6 +20,7 @@ package io.bitsquare.headless;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import io.bitsquare.app.BitsquareEnvironment;
 import io.bitsquare.app.BitsquareExecutable;
+import io.bitsquare.app.CoreOptionKeys;
 import io.bitsquare.common.UserThread;
 import joptsimple.OptionException;
 import joptsimple.OptionParser;
@@ -31,7 +32,8 @@ import java.util.Scanner;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 
-import static io.bitsquare.app.BitsquareEnvironment.*;
+import static io.bitsquare.app.BitsquareEnvironment.DEFAULT_APP_NAME;
+import static io.bitsquare.app.BitsquareEnvironment.DEFAULT_USER_DATA_DIR;
 
 public class HeadlessMain extends BitsquareExecutable {
     private static final Logger log = LoggerFactory.getLogger(HeadlessMain.class);
@@ -50,9 +52,9 @@ public class HeadlessMain extends BitsquareExecutable {
         BitsquareEnvironment.setDefaultAppName("Bitsquare_headless");
         OptionParser parser = new OptionParser();
         parser.allowsUnrecognizedOptions();
-        parser.accepts(USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
+        parser.accepts(CoreOptionKeys.USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
                 .withRequiredArg();
-        parser.accepts(APP_NAME_KEY, description("Application name", DEFAULT_APP_NAME))
+        parser.accepts(CoreOptionKeys.APP_NAME_KEY, description("Application name", DEFAULT_APP_NAME))
                 .withRequiredArg();
 
         OptionSet options;
@@ -68,7 +70,7 @@ public class HeadlessMain extends BitsquareExecutable {
         BitsquareEnvironment bitsquareEnvironment = new BitsquareEnvironment(options);
 
         // need to call that before BitsquareAppMain().execute(args)
-        BitsquareExecutable.initAppDir(bitsquareEnvironment.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY));
+        BitsquareExecutable.initAppDir(bitsquareEnvironment.getProperty(CoreOptionKeys.APP_DATA_DIR_KEY));
 
         // For some reason the JavaFX launch process results in us losing the thread context class loader: reset it.
         // In order to work around a bug in JavaFX 8u25 and below, you must include the following code as the first line of your realMain method:

monitor/src/main/java/io/bitsquare/monitor/Monitor.java

@@ -4,6 +4,7 @@ import ch.qos.logback.classic.Level;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import io.bitsquare.app.BitsquareEnvironment;
+import io.bitsquare.app.CoreOptionKeys;
 import io.bitsquare.app.Log;
 import io.bitsquare.app.Version;
 import io.bitsquare.arbitration.ArbitratorManager;
@@ -42,7 +43,7 @@ public class Monitor {
     }
 
     public Monitor() {
-        String logPath = Paths.get(env.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY), "bitsquare").toString();
+        String logPath = Paths.get(env.getProperty(CoreOptionKeys.APP_DATA_DIR_KEY), "bitsquare").toString();
         Log.setup(logPath);
         log.info("Log files under: " + logPath);
         Version.printVersion();

monitor/src/main/java/io/bitsquare/monitor/MonitorMain.java

@@ -20,6 +20,7 @@ package io.bitsquare.monitor;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import io.bitsquare.app.BitsquareEnvironment;
 import io.bitsquare.app.BitsquareExecutable;
+import io.bitsquare.app.CoreOptionKeys;
 import io.bitsquare.common.UserThread;
 import joptsimple.OptionException;
 import joptsimple.OptionParser;
@@ -31,7 +32,8 @@ import java.util.Scanner;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 
-import static io.bitsquare.app.BitsquareEnvironment.*;
+import static io.bitsquare.app.BitsquareEnvironment.DEFAULT_APP_NAME;
+import static io.bitsquare.app.BitsquareEnvironment.DEFAULT_USER_DATA_DIR;
 
 public class MonitorMain extends BitsquareExecutable {
     private static final Logger log = LoggerFactory.getLogger(MonitorMain.class);
@@ -50,9 +52,9 @@ public class MonitorMain extends BitsquareExecutable {
         BitsquareEnvironment.setDefaultAppName("Bitsquare_monitor");
         OptionParser parser = new OptionParser();
         parser.allowsUnrecognizedOptions();
-        parser.accepts(USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
+        parser.accepts(CoreOptionKeys.USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
                 .withRequiredArg();
-        parser.accepts(APP_NAME_KEY, description("Application name", DEFAULT_APP_NAME))
+        parser.accepts(CoreOptionKeys.APP_NAME_KEY, description("Application name", DEFAULT_APP_NAME))
                 .withRequiredArg();
 
         OptionSet options;
@@ -68,7 +70,7 @@ public class MonitorMain extends BitsquareExecutable {
         BitsquareEnvironment bitsquareEnvironment = new BitsquareEnvironment(options);
 
         // need to call that before BitsquareAppMain().execute(args)
-        BitsquareExecutable.initAppDir(bitsquareEnvironment.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY));
+        BitsquareExecutable.initAppDir(bitsquareEnvironment.getProperty(CoreOptionKeys.APP_DATA_DIR_KEY));
 
         // For some reason the JavaFX launch process results in us losing the thread context class loader: reset it.
         // In order to work around a bug in JavaFX 8u25 and below, you must include the following code as the first line of your realMain method:

seednode/src/main/java/io/bitsquare/seednode/SeedNode.java

@@ -4,6 +4,7 @@ import ch.qos.logback.classic.Level;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import io.bitsquare.app.BitsquareEnvironment;
+import io.bitsquare.app.CoreOptionKeys;
 import io.bitsquare.app.Log;
 import io.bitsquare.app.Version;
 import io.bitsquare.arbitration.ArbitratorManager;
@@ -40,7 +41,7 @@ public class SeedNode {
     }
 
     public SeedNode() {
-        String logPath = Paths.get(env.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY), "bitsquare").toString();
+        String logPath = Paths.get(env.getProperty(CoreOptionKeys.APP_DATA_DIR_KEY), "bitsquare").toString();
         Log.setup(logPath);
         log.info("Log files under: " + logPath);
         Version.printVersion();

seednode/src/main/java/io/bitsquare/seednode/SeedNodeMain.java

@@ -20,6 +20,7 @@ package io.bitsquare.seednode;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import io.bitsquare.app.BitsquareEnvironment;
 import io.bitsquare.app.BitsquareExecutable;
+import io.bitsquare.app.CoreOptionKeys;
 import io.bitsquare.common.UserThread;
 import io.bitsquare.common.util.Profiler;
 import io.bitsquare.common.util.RestartUtil;
@@ -33,7 +34,8 @@ import java.io.IOException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 
-import static io.bitsquare.app.BitsquareEnvironment.*;
+import static io.bitsquare.app.BitsquareEnvironment.DEFAULT_APP_NAME;
+import static io.bitsquare.app.BitsquareEnvironment.DEFAULT_USER_DATA_DIR;
 
 public class SeedNodeMain extends BitsquareExecutable {
     private static final Logger log = LoggerFactory.getLogger(SeedNodeMain.class);
@@ -54,9 +56,9 @@ public class SeedNodeMain extends BitsquareExecutable {
         BitsquareEnvironment.setDefaultAppName("Bitsquare_seednode");
         OptionParser parser = new OptionParser();
         parser.allowsUnrecognizedOptions();
-        parser.accepts(USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
+        parser.accepts(CoreOptionKeys.USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
                 .withRequiredArg();
-        parser.accepts(APP_NAME_KEY, description("Application name", DEFAULT_APP_NAME))
+        parser.accepts(CoreOptionKeys.APP_NAME_KEY, description("Application name", DEFAULT_APP_NAME))
                 .withRequiredArg();
 
         OptionSet options;
@@ -72,7 +74,7 @@ public class SeedNodeMain extends BitsquareExecutable {
         BitsquareEnvironment bitsquareEnvironment = new BitsquareEnvironment(options);
 
         // need to call that before BitsquareAppMain().execute(args)
-        BitsquareExecutable.initAppDir(bitsquareEnvironment.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY));
+        BitsquareExecutable.initAppDir(bitsquareEnvironment.getProperty(CoreOptionKeys.APP_DATA_DIR_KEY));
 
         // For some reason the JavaFX launch process results in us losing the thread context class loader: reset it.
         // In order to work around a bug in JavaFX 8u25 and below, you must include the following code as the first line of your realMain method: