mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use dependency injected Clock in P2PDataStore

Browse Source 
Use the DI Clock object already available in P2PDataStore, instead
of calling System.currentTimeMillis() directly. These two functions
have the same behavior and switching over allows finer control
of time in the tests.
This commit is contained in:
Julian Knutsen 2019-11-06 11:04:01 -08:00
parent e5f9261d97
commit de72d3954d
No known key found for this signature in database
GPG Key ID: D85F536DB3615B2D
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java
View File

@ -409,7 +409,7 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
hashMapChangedListeners.forEach(e -> e.onAdded(protectedStorageEntry)); hashMapChangedListeners.forEach(e -> e.onAdded(protectedStorageEntry));
// Record the updated sequence number and persist it. Higher delay so we can batch more items. // Record the updated sequence number and persist it. Higher delay so we can batch more items.
sequenceNumberMap.put(hashOfPayload, new MapValue(protectedStorageEntry.getSequenceNumber(), System.currentTimeMillis())); sequenceNumberMap.put(hashOfPayload, new MapValue(protectedStorageEntry.getSequenceNumber(), this.clock.millis()));
sequenceNumberMapStorage.queueUpForSave(SequenceNumberMap.clone(sequenceNumberMap), 2000); sequenceNumberMapStorage.queueUpForSave(SequenceNumberMap.clone(sequenceNumberMap), 2000);
// Optionally, broadcast the add/update depending on the calling environment // Optionally, broadcast the add/update depending on the calling environment
@ -472,7 +472,7 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
printData("after refreshTTL"); printData("after refreshTTL");
// Record the latest sequence number and persist it // Record the latest sequence number and persist it
sequenceNumberMap.put(hashOfPayload, new MapValue(sequenceNumber, System.currentTimeMillis())); sequenceNumberMap.put(hashOfPayload, new MapValue(sequenceNumber, this.clock.millis()));
sequenceNumberMapStorage.queueUpForSave(SequenceNumberMap.clone(sequenceNumberMap), 1000); sequenceNumberMapStorage.queueUpForSave(SequenceNumberMap.clone(sequenceNumberMap), 1000);
// Always broadcast refreshes // Always broadcast refreshes
@ -492,7 +492,6 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
// If we don't know about the target of this remove, ignore it // If we don't know about the target of this remove, ignore it
if (!map.containsKey(hashOfPayload)) { if (!map.containsKey(hashOfPayload)) {
log.debug("Remove data ignored as we don't have an entry for that data."); log.debug("Remove data ignored as we don't have an entry for that data.");
return false; return false;
} }
@ -513,7 +512,7 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
printData("after remove"); printData("after remove");
// Record the latest sequence number and persist it // Record the latest sequence number and persist it
sequenceNumberMap.put(hashOfPayload, new MapValue(protectedStorageEntry.getSequenceNumber(), System.currentTimeMillis())); sequenceNumberMap.put(hashOfPayload, new MapValue(protectedStorageEntry.getSequenceNumber(), this.clock.millis()));
sequenceNumberMapStorage.queueUpForSave(SequenceNumberMap.clone(sequenceNumberMap), 300); sequenceNumberMapStorage.queueUpForSave(SequenceNumberMap.clone(sequenceNumberMap), 300);
maybeAddToRemoveAddOncePayloads(protectedStoragePayload, hashOfPayload); maybeAddToRemoveAddOncePayloads(protectedStoragePayload, hashOfPayload);
@ -608,7 +607,7 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
printData("after removeMailboxData"); printData("after removeMailboxData");
// Record the latest sequence number and persist it // Record the latest sequence number and persist it
sequenceNumberMap.put(hashOfPayload, new MapValue(sequenceNumber, System.currentTimeMillis())); sequenceNumberMap.put(hashOfPayload, new MapValue(sequenceNumber, this.clock.millis()));
sequenceNumberMapStorage.queueUpForSave(SequenceNumberMap.clone(sequenceNumberMap), 300); sequenceNumberMapStorage.queueUpForSave(SequenceNumberMap.clone(sequenceNumberMap), 300);
maybeAddToRemoveAddOncePayloads(protectedStoragePayload, hashOfPayload); maybeAddToRemoveAddOncePayloads(protectedStoragePayload, hashOfPayload);
@ -839,7 +838,7 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
// Get a new map with entries older than PURGE_AGE_DAYS purged from the given map. // Get a new map with entries older than PURGE_AGE_DAYS purged from the given map.
private Map<ByteArray, MapValue> getPurgedSequenceNumberMap(Map<ByteArray, MapValue> persisted) { private Map<ByteArray, MapValue> getPurgedSequenceNumberMap(Map<ByteArray, MapValue> persisted) {
Map<ByteArray, MapValue> purged = new HashMap<>(); Map<ByteArray, MapValue> purged = new HashMap<>();
long maxAgeTs = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(PURGE_AGE_DAYS); long maxAgeTs = this.clock.millis() - TimeUnit.DAYS.toMillis(PURGE_AGE_DAYS);
persisted.forEach((key, value) -> { persisted.forEach((key, value) -> {
if (value.timeStamp > maxAgeTs) if (value.timeStamp > maxAgeTs)
purged.put(key, value); purged.put(key, value);