Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test guice setup and fix #3043

Merged
merged 5 commits into from
Aug 5, 2019
Merged

Test guice setup and fix #3043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47c7910
Move Clock binding to P2PModule
sqrrm Aug 1, 2019
ba1d493
test the seednode's guice setup
christophsturm Aug 1, 2019
0698e31
test all of it
christophsturm Aug 1, 2019
18115c9
Update build.gradle
christophsturm Aug 1, 2019
f96edd2
create key directory if it does not exist
christophsturm Aug 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

Expand Down
1 change: 1 addition & 0 deletions common/src/main/java/bisq/common/crypto/KeyStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public String toString() {

@Inject
public KeyStorage(@Named(KEY_STORAGE_DIR) File storageDir) {
storageDir.mkdirs();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the CI error came from a missing key directory on CI. I now changed the keystorage to create the directory if its missing. not sure if that has any downsides.

this.storageDir = storageDir;
}

Expand Down
3 changes: 0 additions & 3 deletions core/src/main/java/bisq/core/CoreModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
3 changes: 3 additions & 0 deletions p2p/src/main/java/bisq/network/p2p/P2PModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
19 changes: 19 additions & 0 deletions seednode/src/test/java/bisq/seednode/GuiceSetupTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}