Merge pull request #3043 from christophsturm/test-guice-setup-and-fix

Test guice setup and fix

build.gradle

@@ -404,6 +404,7 @@ configure(project(':seednode')) {
         runtime "org.bouncycastle:bcprov-jdk15on:$bcVersion"
         compileOnly "org.projectlombok:lombok:$lombokVersion"
         annotationProcessor "org.projectlombok:lombok:$lombokVersion"
+        testCompile "org.springframework:spring-test:$springVersion"
     }
 }
 

common/src/main/java/bisq/common/crypto/KeyStorage.java

@@ -97,6 +97,7 @@ public String toString() {
 
     @Inject
     public KeyStorage(@Named(KEY_STORAGE_DIR) File storageDir) {
+        storageDir.mkdirs();
         this.storageDir = storageDir;
     }
 

core/src/main/java/bisq/core/CoreModule.java

@@ -68,8 +68,6 @@
 import com.google.inject.Singleton;
 import com.google.inject.name.Names;
 
-import java.time.Clock;
-
 import java.io.File;
 
 import static com.google.inject.name.Names.named;
@@ -99,7 +97,6 @@ protected void configure() {
         bind(BridgeAddressProvider.class).to(Preferences.class).in(Singleton.class);
         bind(CorruptedDatabaseFilesHandler.class).in(Singleton.class);
         bind(AvoidStandbyModeService.class).in(Singleton.class);
-        bind(Clock.class).toInstance(Clock.systemDefaultZone());
 
         bind(SeedNodeRepository.class).to(DefaultSeedNodeRepository.class).in(Singleton.class);
 

p2p/src/main/java/bisq/network/p2p/P2PModule.java

@@ -41,6 +41,8 @@
 import com.google.inject.Singleton;
 import com.google.inject.name.Names;
 
+import java.time.Clock;
+
 import java.io.File;
 
 import static com.google.inject.name.Names.named;
@@ -54,6 +56,7 @@ public P2PModule(Environment environment) {
 
     @Override
     protected void configure() {
+        bind(Clock.class).toInstance(Clock.systemDefaultZone());
         bind(P2PService.class).in(Singleton.class);
         bind(PeerManager.class).in(Singleton.class);
         bind(P2PDataStorage.class).in(Singleton.class);

seednode/src/test/java/bisq/seednode/GuiceSetupTest.java

@@ -0,0 +1,19 @@
+package bisq.seednode;
+
+import bisq.core.app.BisqEnvironment;
+import bisq.core.app.misc.AppSetupWithP2PAndDAO;
+import bisq.core.app.misc.ModuleForAppWithP2p;
+
+import org.springframework.mock.env.MockPropertySource;
+
+import com.google.inject.Guice;
+
+import org.junit.Test;
+
+public class GuiceSetupTest {
+    @Test
+    public void testGuiceSetup() {
+        ModuleForAppWithP2p module = new ModuleForAppWithP2p(new BisqEnvironment(new MockPropertySource()));
+        Guice.createInjector(module).getInstance(AppSetupWithP2PAndDAO.class);
+    }
+}