mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add RemovedPayloadsStorageService

Browse source 
Adjust param
This commit is contained in:
chimp1984 2021-01-10 22:56:50 -05:00
parent 1886b4eb9d
commit 5ba7d78a39
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
p2p/src/test/java/bisq/network/p2p/storage/TestState.java
View file

@ -35,6 +35,7 @@ import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreListener;
import bisq.network.p2p.storage.persistence.ProtectedDataStoreService;
import bisq.network.p2p.storage.persistence.RemovedPayloadsStorageService;
import bisq.network.p2p.storage.persistence.ResourceDataStoreService;
import bisq.network.p2p.storage.persistence.SequenceNumberMap;
@ -72,10 +73,12 @@ public class TestState {
private final PersistenceManager<SequenceNumberMap> mockSeqNrPersistenceManager;
private final ProtectedDataStoreService protectedDataStoreService;
final ClockFake clockFake;
private RemovedPayloadsStorageService removedPayloadsStorageService;
TestState() {
this.mockBroadcaster = mock(Broadcaster.class);
this.mockSeqNrPersistenceManager = mock(PersistenceManager.class);
this.removedPayloadsStorageService = mock(RemovedPayloadsStorageService.class);
this.clockFake = new ClockFake();
this.protectedDataStoreService = new ProtectedDataStoreService();
@ -84,6 +87,7 @@ public class TestState {
new AppendOnlyDataStoreServiceFake(),
this.protectedDataStoreService, mock(ResourceDataStoreService.class),
this.mockSeqNrPersistenceManager,
removedPayloadsStorageService,
this.clockFake,
MAX_SEQUENCE_NUMBER_MAP_SIZE_BEFORE_PURGE);
@ -97,7 +101,8 @@ public class TestState {
this.mockSeqNrPersistenceManager,
this.clockFake,
this.hashMapChangedListener,
this.appendOnlyDataStoreListener);
this.appendOnlyDataStoreListener,
removedPayloadsStorageService);
when(this.mockSeqNrPersistenceManager.getPersisted())
.thenReturn(this.mockedStorage.sequenceNumberMap);
@ -110,13 +115,15 @@ public class TestState {
* not running the entire storage code paths.
*/
void simulateRestart() {
this.removedPayloadsStorageService = mock(RemovedPayloadsStorageService.class);
this.mockedStorage = createP2PDataStorageForTest(
this.mockBroadcaster,
this.protectedDataStoreService,
this.mockSeqNrPersistenceManager,
this.clockFake,
this.hashMapChangedListener,
this.appendOnlyDataStoreListener);
this.appendOnlyDataStoreListener,
removedPayloadsStorageService);
when(this.mockSeqNrPersistenceManager.getPersisted())
.thenReturn(this.mockedStorage.sequenceNumberMap);
@ -128,13 +135,18 @@ public class TestState {
PersistenceManager<SequenceNumberMap> sequenceNrMapPersistenceManager,
ClockFake clock,
HashMapChangedListener hashMapChangedListener,
AppendOnlyDataStoreListener appendOnlyDataStoreListener) {
AppendOnlyDataStoreListener appendOnlyDataStoreListener,
RemovedPayloadsStorageService removedPayloadsStorageService) {
P2PDataStorage p2PDataStorage = new P2PDataStorage(mock(NetworkNode.class),
broadcaster,
new AppendOnlyDataStoreServiceFake(),
protectedDataStoreService, mock(ResourceDataStoreService.class),
sequenceNrMapPersistenceManager, clock, MAX_SEQUENCE_NUMBER_MAP_SIZE_BEFORE_PURGE);
protectedDataStoreService,
mock(ResourceDataStoreService.class),
sequenceNrMapPersistenceManager,
removedPayloadsStorageService,
clock,
MAX_SEQUENCE_NUMBER_MAP_SIZE_BEFORE_PURGE);
// Currently TestState only supports reading ProtectedStorageEntries off disk.
p2PDataStorage.readFromResourcesSync("unused");

2
p2p/src/test/java/bisq/network/p2p/storage/messages/AddDataMessageTest.java
View file

@ -69,7 +69,7 @@ public class AddDataMessageTest {
@Test
public void toProtoBuf() throws Exception {
SealedAndSigned sealedAndSigned = new SealedAndSigned(RandomUtils.nextBytes(10), RandomUtils.nextBytes(10), RandomUtils.nextBytes(10), keyRing1.getPubKeyRing().getSignaturePubKey());
PrefixedSealedAndSignedMessage prefixedSealedAndSignedMessage = new PrefixedSealedAndSignedMessage(new NodeAddress("host", 1000), sealedAndSigned, RandomUtils.nextBytes(10),
PrefixedSealedAndSignedMessage prefixedSealedAndSignedMessage = new PrefixedSealedAndSignedMessage(new NodeAddress("host", 1000), sealedAndSigned,
UUID.randomUUID().toString());
MailboxStoragePayload mailboxStoragePayload = new MailboxStoragePayload(prefixedSealedAndSignedMessage,
keyRing1.getPubKeyRing().getSignaturePubKey(), keyRing1.getPubKeyRing().getSignaturePubKey());