Merge pull request #971 from alvasw/tor_create_da_package

Tor: Create da package for DirectoryAuthority classes
bisq-network · Jul 7, 2023 · d832bb9 · d832bb9
2 parents bf6d69c + 62b036c
commit d832bb9
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 9 deletions.
diff --git a/...src/integrationTest/java/bisq/tor/local_network/DirectoryAuthorityKeyGenerationTests.java b/...src/integrationTest/java/bisq/tor/local_network/DirectoryAuthorityKeyGenerationTests.java
@@ -17,6 +17,10 @@
 
 package bisq.tor.local_network;
 
+import bisq.tor.local_network.da.DirectoryAuthority;
+import bisq.tor.local_network.da.keygen.process.DirectoryAuthorityKeyGenerator;
+import bisq.tor.local_network.da.keygen.process.DirectoryIdentityKeyGenProcess;
+import bisq.tor.local_network.da.keygen.RelayKeyGenProcess;
 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
@@ -18,6 +18,8 @@
 package bisq.tor.local_network;
 
 import bisq.common.util.NetworkUtils;
+import bisq.tor.local_network.da.DirectoryAuthority;
+import bisq.tor.local_network.da.DirectoryAuthorityFactory;
 import bisq.tor.local_network.torrc.DirectoryAuthorityTorrcGenerator;
 import bisq.tor.local_network.torrc.TorrcFileGenerator;
 import org.junit.jupiter.api.Test;

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

diff --git a/...al_network/DirectoryAuthorityFactory.java → ...network/da/DirectoryAuthorityFactory.java b/...al_network/DirectoryAuthorityFactory.java → ...network/da/DirectoryAuthorityFactory.java
@@ -15,8 +15,11 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.tor.local_network;
+package bisq.tor.local_network.da;
 
+import bisq.tor.local_network.da.keygen.process.DirectoryAuthorityKeyGenerator;
+import bisq.tor.local_network.da.keygen.process.DirectoryIdentityKeyGenProcess;
+import bisq.tor.local_network.da.keygen.RelayKeyGenProcess;
 import lombok.Getter;
 
 import java.io.File;

diff --git a/...tor/local_network/RelayKeyGenProcess.java → ...network/da/keygen/RelayKeyGenProcess.java b/...tor/local_network/RelayKeyGenProcess.java → ...network/da/keygen/RelayKeyGenProcess.java
@@ -15,7 +15,10 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.tor.local_network;
+package bisq.tor.local_network.da.keygen;
+
+import bisq.tor.local_network.KeyFingerprintReader;
+import bisq.tor.local_network.da.DirectoryAuthority;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...twork/DirectoryAuthorityKeyGenerator.java → ...ocess/DirectoryAuthorityKeyGenerator.java b/...twork/DirectoryAuthorityKeyGenerator.java → ...ocess/DirectoryAuthorityKeyGenerator.java
@@ -15,8 +15,10 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.tor.local_network;
+package bisq.tor.local_network.da.keygen.process;
 
+import bisq.tor.local_network.InputStreamWaiter;
+import bisq.tor.local_network.da.keygen.RelayKeyGenProcess;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/...twork/DirectoryIdentityKeyGenProcess.java → ...ocess/DirectoryIdentityKeyGenProcess.java b/...twork/DirectoryIdentityKeyGenProcess.java → ...ocess/DirectoryIdentityKeyGenProcess.java
@@ -15,8 +15,9 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.tor.local_network;
+package bisq.tor.local_network.da.keygen.process;
 
+import bisq.tor.local_network.KeyFingerprintReader;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 

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.DirectoryAuthority;
+import bisq.tor.local_network.da.DirectoryAuthority;
 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.DirectoryAuthority;
+import bisq.tor.local_network.da.DirectoryAuthority;
 
 public class DirectoryAuthorityTorrcGenerator extends CommonTorrcGenerator {
     public DirectoryAuthorityTorrcGenerator(DirectoryAuthority 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.DirectoryAuthority;
+import bisq.tor.local_network.da.DirectoryAuthority;
 
 public class RelayTorrcGenerator extends CommonTorrcGenerator {
     public RelayTorrcGenerator(DirectoryAuthority thisDirectoryAuthority) {

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.DirectoryAuthority;
+import bisq.tor.local_network.da.DirectoryAuthority;
 
 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,6 +17,7 @@
 
 package bisq.tor.local_network;
 
+import bisq.tor.local_network.da.DirectoryAuthority;
 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,6 +17,7 @@
 
 package bisq.tor.local_network;
 
+import bisq.tor.local_network.da.DirectoryAuthority;
 import bisq.tor.local_network.torrc.RelayTorrcGenerator;
 import bisq.tor.local_network.torrc.TorrcFileGenerator;
 import org.junit.jupiter.api.Test;