Move TorNode to root package

bisq-network · Jul 7, 2023 · 95a3215 · 95a3215
1 parent 93ba0b0
commit 95a3215
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 12 deletions.
diff --git a/...src/integrationTest/java/bisq/tor/local_network/DirectoryAuthorityKeyGenerationTests.java b/...src/integrationTest/java/bisq/tor/local_network/DirectoryAuthorityKeyGenerationTests.java
@@ -17,7 +17,6 @@
 
 package bisq.tor.local_network;
 
-import bisq.tor.local_network.da.TorNode;
 import bisq.tor.local_network.da.keygen.process.DirectoryAuthorityKeyGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;

diff --git a/...ocal-network/src/integrationTest/java/bisq/tor/local_network/DirectoryAuthorityTests.java b/...ocal-network/src/integrationTest/java/bisq/tor/local_network/DirectoryAuthorityTests.java
@@ -19,7 +19,6 @@
 
 import bisq.common.util.NetworkUtils;
 import bisq.tor.local_network.da.DirectoryAuthorityFactory;
-import bisq.tor.local_network.da.TorNode;
 import bisq.tor.local_network.torrc.DirectoryAuthorityTorrcGenerator;
 import bisq.tor.local_network.torrc.TorrcFileGenerator;
 import org.junit.jupiter.api.Test;

diff --git a/...va/bisq/tor/local_network/da/TorNode.java → .../java/bisq/tor/local_network/TorNode.java b/...va/bisq/tor/local_network/da/TorNode.java → .../java/bisq/tor/local_network/TorNode.java
@@ -15,9 +15,8 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.tor.local_network.da;
+package bisq.tor.local_network;
 
-import bisq.tor.local_network.KeyFingerprintReader;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;

diff --git a/.../tor-local-network/src/main/java/bisq/tor/local_network/da/DirectoryAuthorityFactory.java b/.../tor-local-network/src/main/java/bisq/tor/local_network/da/DirectoryAuthorityFactory.java
@@ -17,6 +17,7 @@
 
 package bisq.tor.local_network.da;
 
+import bisq.tor.local_network.TorNode;
 import bisq.tor.local_network.da.keygen.process.DirectoryAuthorityKeyGenerator;
 import lombok.Getter;
 

diff --git a/.../tor-local-network/src/main/java/bisq/tor/local_network/da/keygen/RelayKeyGenProcess.java b/.../tor-local-network/src/main/java/bisq/tor/local_network/da/keygen/RelayKeyGenProcess.java
@@ -17,7 +17,7 @@
 
 package bisq.tor.local_network.da.keygen;
 
-import bisq.tor.local_network.da.TorNode;
+import bisq.tor.local_network.TorNode;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;

diff --git a/...rc/main/java/bisq/tor/local_network/da/keygen/process/DirectoryAuthorityKeyGenerator.java b/...rc/main/java/bisq/tor/local_network/da/keygen/process/DirectoryAuthorityKeyGenerator.java
@@ -17,7 +17,7 @@
 
 package bisq.tor.local_network.da.keygen.process;
 
-import bisq.tor.local_network.da.TorNode;
+import bisq.tor.local_network.TorNode;
 import bisq.tor.local_network.da.keygen.RelayKeyGenProcess;
 
 import java.io.IOException;

diff --git a/...rk/tor-local-network/src/main/java/bisq/tor/local_network/torrc/CommonTorrcGenerator.java b/...rk/tor-local-network/src/main/java/bisq/tor/local_network/torrc/CommonTorrcGenerator.java
@@ -17,7 +17,7 @@
 
 package bisq.tor.local_network.torrc;
 
-import bisq.tor.local_network.da.TorNode;
+import bisq.tor.local_network.TorNode;
 import lombok.Getter;
 
 /**

diff --git a/...-network/src/main/java/bisq/tor/local_network/torrc/DirectoryAuthorityTorrcGenerator.java b/...-network/src/main/java/bisq/tor/local_network/torrc/DirectoryAuthorityTorrcGenerator.java
@@ -17,7 +17,7 @@
 
 package bisq.tor.local_network.torrc;
 
-import bisq.tor.local_network.da.TorNode;
+import bisq.tor.local_network.TorNode;
 
 public class DirectoryAuthorityTorrcGenerator extends CommonTorrcGenerator {
     public DirectoryAuthorityTorrcGenerator(TorNode thisDirectoryAuthority) {

diff --git a/...ork/tor-local-network/src/main/java/bisq/tor/local_network/torrc/RelayTorrcGenerator.java b/...ork/tor-local-network/src/main/java/bisq/tor/local_network/torrc/RelayTorrcGenerator.java
@@ -17,7 +17,7 @@
 
 package bisq.tor.local_network.torrc;
 
-import bisq.tor.local_network.da.TorNode;
+import bisq.tor.local_network.TorNode;
 
 public class RelayTorrcGenerator extends CommonTorrcGenerator {
     public RelayTorrcGenerator(TorNode thisTorNode) {

diff --git a/network/tor-local-network/src/main/java/bisq/tor/local_network/torrc/TorrcFileGenerator.java b/network/tor-local-network/src/main/java/bisq/tor/local_network/torrc/TorrcFileGenerator.java
@@ -17,7 +17,7 @@
 
 package bisq.tor.local_network.torrc;
 
-import bisq.tor.local_network.da.TorNode;
+import bisq.tor.local_network.TorNode;
 
 import java.io.IOException;
 import java.nio.file.Files;

diff --git a/...l-network/src/test/java/bisq/tor/local_network/DirectoryAuthorityTorrcGeneratorTests.java b/...l-network/src/test/java/bisq/tor/local_network/DirectoryAuthorityTorrcGeneratorTests.java
@@ -17,7 +17,6 @@
 
 package bisq.tor.local_network;
 
-import bisq.tor.local_network.da.TorNode;
 import bisq.tor.local_network.torrc.DirectoryAuthorityTorrcGenerator;
 import bisq.tor.local_network.torrc.TorrcFileGenerator;
 import org.junit.jupiter.api.Test;

diff --git a/network/tor-local-network/src/test/java/bisq/tor/local_network/RelayTorrcGeneratorTests.java b/network/tor-local-network/src/test/java/bisq/tor/local_network/RelayTorrcGeneratorTests.java
@@ -17,7 +17,6 @@
 
 package bisq.tor.local_network;
 
-import bisq.tor.local_network.da.TorNode;
 import bisq.tor.local_network.torrc.RelayTorrcGenerator;
 import bisq.tor.local_network.torrc.TorrcFileGenerator;
 import org.junit.jupiter.api.Test;