Use dependency injected Clock in P2PDataStore

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.
bisq-network · Nov 12, 2019 · de72d39 · de72d39
1 parent e5f9261
commit de72d39
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java b/p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java
@@ -409,7 +409,7 @@ public boolean addProtectedStorageEntry(ProtectedStorageEntry protectedStorageEn
         hashMapChangedListeners.forEach(e -> e.onAdded(protectedStorageEntry));
 
         // 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);
 
         // Optionally, broadcast the add/update depending on the calling environment
@@ -472,7 +472,7 @@ public boolean refreshTTL(RefreshOfferMessage refreshTTLMessage,
         printData("after refreshTTL");
 
         // 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);
 
         // Always broadcast refreshes
@@ -492,7 +492,6 @@ public boolean remove(ProtectedStorageEntry protectedStorageEntry,
         // If we don't know about the target of this remove, ignore it
         if (!map.containsKey(hashOfPayload)) {
             log.debug("Remove data ignored as we don't have an entry for that data.");
-
             return false;
         }
 
@@ -513,7 +512,7 @@ public boolean remove(ProtectedStorageEntry protectedStorageEntry,
         printData("after remove");
 
         // 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);
 
         maybeAddToRemoveAddOncePayloads(protectedStoragePayload, hashOfPayload);
@@ -608,7 +607,7 @@ public boolean removeMailboxData(ProtectedMailboxStorageEntry protectedMailboxSt
         printData("after removeMailboxData");
 
         // 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);
 
         maybeAddToRemoveAddOncePayloads(protectedStoragePayload, hashOfPayload);
@@ -839,7 +838,7 @@ private static byte[] getCompactHash(ProtectedStoragePayload protectedStoragePay
     // 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) {
         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) -> {
             if (value.timeStamp > maxAgeTs)
                 purged.put(key, value);