Removing all changes to make GUI work with the API

The other changes in GUI, namely small refactoring to have the GUI
and the API use the same methods to calculate things have been
left in place.

core/src/main/java/io/bisq/core/app/AppOptionKeys.java

@@ -8,5 +8,4 @@ public class AppOptionKeys {
     public static final String MAX_MEMORY = "maxMemory";
     public static final String DUMP_STATISTICS = "dumpStatistics";
     public static final String IGNORE_DEV_MSG_KEY = "ignoreDevMsg";
-    public static final String ENABLE_API = "enableAPI";
 }

core/src/main/java/io/bisq/core/app/BisqEnvironment.java

@@ -166,7 +166,7 @@ private static String appDataDir(String userDataDir, String appName) {
 
     private final String btcNodes, seedNodes, ignoreDevMsg, useTorForBtc, rpcUser, rpcPassword,
             rpcPort, rpcBlockNotificationPort, dumpBlockchainData, fullDaoNode,
-            myAddress, banList, dumpStatistics, enableApi, maxMemory, socks5ProxyBtcAddress,
+            myAddress, banList, dumpStatistics, maxMemory, socks5ProxyBtcAddress,
             socks5ProxyHttpAddress;
 
 
@@ -200,9 +200,6 @@ public BisqEnvironment(PropertySource commandLineProperties) {
         dumpStatistics = commandLineProperties.containsProperty(AppOptionKeys.DUMP_STATISTICS) ?
                 (String) commandLineProperties.getProperty(AppOptionKeys.DUMP_STATISTICS) :
                 "";
-        enableApi = commandLineProperties.containsProperty(AppOptionKeys.ENABLE_API) ?
-                (String) commandLineProperties.getProperty(AppOptionKeys.ENABLE_API) :
-                "";
         maxMemory = commandLineProperties.containsProperty(AppOptionKeys.MAX_MEMORY) ?
                 (String) commandLineProperties.getProperty(AppOptionKeys.MAX_MEMORY) :
                 "";
@@ -347,7 +344,6 @@ private PropertySource<?> defaultProperties() {
                 setProperty(AppOptionKeys.APP_DATA_DIR_KEY, appDataDir);
                 setProperty(AppOptionKeys.IGNORE_DEV_MSG_KEY, ignoreDevMsg);
                 setProperty(AppOptionKeys.DUMP_STATISTICS, dumpStatistics);
-                setProperty(AppOptionKeys.ENABLE_API, enableApi);
                 setProperty(AppOptionKeys.APP_NAME_KEY, appName);
                 setProperty(AppOptionKeys.MAX_MEMORY, maxMemory);
                 setProperty(AppOptionKeys.USER_DATA_DIR_KEY, userDataDir);

core/src/main/java/io/bisq/core/app/BisqExecutable.java

@@ -128,10 +128,6 @@ protected void customizeOptionParsing(OptionParser parser) {
                 description("If set to true the trade statistics are stored as json file in the data dir.", false))
                 .withRequiredArg()
                 .ofType(boolean.class);
-        parser.accepts(AppOptionKeys.ENABLE_API,
-                description("If set to true the trading api is enabled.", false))
-                .withRequiredArg()
-                .ofType(boolean.class);
         parser.accepts(AppOptionKeys.PROVIDERS,
                 description("Custom providers (comma separated)", false))
                 .withRequiredArg();

gui/pom.xml

@@ -342,12 +342,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.bisq</groupId>
-            <artifactId>api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.controlsfx</groupId>
             <artifactId>controlsfx</artifactId>
@@ -371,10 +365,6 @@
             <artifactId>jcsv</artifactId>
             <version>1.4.0</version>
         </dependency>
-        <dependency>
-            <groupId>io.bisq</groupId>
-            <artifactId>api</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
+
     </dependencies>
 </project>

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

@@ -37,8 +37,6 @@
 
 import java.util.ResourceBundle;
 
-import static com.google.inject.name.Names.named;
-
 public class GuiModule extends AppModule {
 
     private final Stage primaryStage;
@@ -75,6 +73,5 @@ protected void configure() {
         bind(Stage.class).toInstance(primaryStage);
 
         bindConstant().annotatedWith(Names.named(AppOptionKeys.APP_NAME_KEY)).to(environment.getRequiredProperty(AppOptionKeys.APP_NAME_KEY));
-        bindConstant().annotatedWith(named(AppOptionKeys.ENABLE_API)).to(environment.getRequiredProperty(AppOptionKeys.ENABLE_API));
     }
 }

gui/src/main/java/io/bisq/gui/app/BisqApp.java

@@ -21,7 +21,6 @@
 import ch.qos.logback.classic.Logger;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import io.bisq.api.service.DropwizardApplication;
 import io.bisq.common.CommonOptionKeys;
 import io.bisq.common.UserThread;
 import io.bisq.common.app.DevEnv;
@@ -163,7 +162,7 @@ public void start(Stage stage) throws IOException {
         Security.addProvider(new BouncyCastleProvider());
 
         final BaseCurrencyNetwork baseCurrencyNetwork = BisqEnvironment.getBaseCurrencyNetwork();
-        String currencyCode = baseCurrencyNetwork.getCurrencyCode();
+        final String currencyCode = baseCurrencyNetwork.getCurrencyCode();
         Res.setBaseCurrencyCode(currencyCode);
         Res.setBaseCurrencyName(baseCurrencyNetwork.getCurrencyName());
         CurrencyUtil.setBaseCurrencyCode(currencyCode);
@@ -173,10 +172,14 @@ public void start(Stage stage) throws IOException {
             bisqAppModule = new BisqAppModule(bisqEnvironment, primaryStage);
             injector = Guice.createInjector(bisqAppModule);
             injector.getInstance(InjectorViewFactory.class).setInjector(injector);
-
-            if(Boolean.valueOf(bisqEnvironment.getRequiredProperty(AppOptionKeys.ENABLE_API))) {
-                injector.getInstance(DropwizardApplication.class).run("server", "bisq-api.yml");
-            }
+/*
+            PrintWriter out = new PrintWriter(new File("grapher.dot"), "UTF-8");
+            Injector injector = Guice.createInjector(new GraphvizModule());
+            GraphvizGrapher grapher = injector.getInstance(GraphvizGrapher.class);
+            grapher.setOut(out);
+            grapher.setRankdir("TB");
+            grapher.graph(injector);
+*/
 
             // All classes which are persisting objects need to be added here
             // Maintain order!

gui/src/main/java/io/bisq/gui/app/BisqAppModule.java

@@ -78,6 +78,7 @@ protected void configure() {
 
         bind(NetworkProtoResolver.class).to(CoreNetworkProtoResolver.class).in(Singleton.class);
         bind(PersistenceProtoResolver.class).to(CorePersistenceProtoResolver.class).in(Singleton.class);
+        bind(Preferences.class).in(Singleton.class);
 
         // ordering is used for shut down sequence
         install(tradeModule());