Merge pull request #4428 from ghubstan/rm-duplicate-compositeoptset

Remove duplicate CompositeOptionSet class
bisq-network · Aug 25, 2020 · f45a26c · f45a26c
2 parents 10215b8 + c402386
commit f45a26c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 62 deletions.
diff --git a/apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java b/apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java
@@ -17,6 +17,8 @@
 
 package bisq.apitest.config;
 
+import bisq.common.config.CompositeOptionSet;
+
 import joptsimple.AbstractOptionSpec;
 import joptsimple.ArgumentAcceptingOptionSpec;
 import joptsimple.HelpFormatter;

diff --git a/apitest/src/main/java/bisq/apitest/config/CompositeOptionSet.java b/apitest/src/main/java/bisq/apitest/config/CompositeOptionSet.java
diff --git a/common/src/main/java/bisq/common/config/CompositeOptionSet.java b/common/src/main/java/bisq/common/config/CompositeOptionSet.java
@@ -17,7 +17,7 @@
  * the command line with those provided via config file, such that those provided at the
  * command line take precedence over those provided in the config file.
  */
-class CompositeOptionSet {
+public class CompositeOptionSet {
 
     private final List<OptionSet> optionSets = new ArrayList<>();