From 486e6f49858215876d8d383cf59bb8575dc5cd6b Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Thu, 1 Oct 2020 19:57:54 -0500 Subject: [PATCH] Use PersistenceManager --- desktop/src/test/java/bisq/desktop/GuiceSetupTest.java | 4 ++-- p2p/src/test/java/bisq/network/p2p/MockNode.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/desktop/src/test/java/bisq/desktop/GuiceSetupTest.java b/desktop/src/test/java/bisq/desktop/GuiceSetupTest.java index aa7c78d4a8..7211170812 100644 --- a/desktop/src/test/java/bisq/desktop/GuiceSetupTest.java +++ b/desktop/src/test/java/bisq/desktop/GuiceSetupTest.java @@ -57,9 +57,9 @@ import bisq.common.crypto.KeyRing; import bisq.common.crypto.KeyStorage; import bisq.common.crypto.PubKeyRing; import bisq.common.file.CorruptedStorageFileHandler; +import bisq.common.persistence.PersistenceManager; import bisq.common.proto.network.NetworkProtoResolver; import bisq.common.proto.persistable.PersistenceProtoResolver; -import bisq.common.storage.Storage; import com.google.inject.Guice; import com.google.inject.Injector; @@ -148,7 +148,7 @@ public class GuiceSetupTest { assertSingleton(MediationDisputeListService.class); assertSingleton(TraderChatManager.class); - assertNotSingleton(Storage.class); + assertNotSingleton(PersistenceManager.class); } private void assertSingleton(Class type) { diff --git a/p2p/src/test/java/bisq/network/p2p/MockNode.java b/p2p/src/test/java/bisq/network/p2p/MockNode.java index 132136bd47..9520cae156 100644 --- a/p2p/src/test/java/bisq/network/p2p/MockNode.java +++ b/p2p/src/test/java/bisq/network/p2p/MockNode.java @@ -28,8 +28,8 @@ import bisq.network.p2p.seed.SeedNodeRepository; import bisq.common.ClockWatcher; import bisq.common.file.CorruptedStorageFileHandler; +import bisq.common.persistence.PersistenceManager; import bisq.common.proto.persistable.PersistenceProtoResolver; -import bisq.common.storage.Storage; import java.nio.file.Files; @@ -59,8 +59,8 @@ public class MockNode { this.maxConnections = maxConnections; networkNode = mock(NetworkNode.class); File storageDir = Files.createTempDirectory("storage").toFile(); - Storage storage = new Storage<>(storageDir, mock(PersistenceProtoResolver.class), mock(CorruptedStorageFileHandler.class)); - peerManager = new PeerManager(networkNode, mock(SeedNodeRepository.class), new ClockWatcher(), maxConnections, storage); + PersistenceManager persistenceManager = new PersistenceManager<>(storageDir, mock(PersistenceProtoResolver.class), mock(CorruptedStorageFileHandler.class)); + peerManager = new PeerManager(networkNode, mock(SeedNodeRepository.class), new ClockWatcher(), maxConnections, persistenceManager); connections = new HashSet<>(); when(networkNode.getAllConnections()).thenReturn(connections); }