[REFACTOR] inline maybeAddToRemoveAddOncePayloads() private function

Now that there is only one user it can be inlined.
bisq-network · Dec 3, 2019 · 1bd450b · 1bd450b
1 parent 5a174d5
commit 1bd450b
Showing 1 changed file with 4 additions and 9 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
@@ -637,7 +637,7 @@ private boolean addProtectedStorageEntry(ProtectedStorageEntry protectedStorageE
 
         return true;
     }
-    
+
     /**
      * Updates a local RefreshOffer with TTL changes and broadcasts those changes to the network
      *
@@ -717,7 +717,9 @@ public boolean remove(ProtectedStorageEntry protectedStorageEntry,
         sequenceNumberMap.put(hashOfPayload, new MapValue(protectedStorageEntry.getSequenceNumber(), this.clock.millis()));
         sequenceNumberMapStorage.queueUpForSave(SequenceNumberMap.clone(sequenceNumberMap), 300);
 
-        maybeAddToRemoveAddOncePayloads(protectedStoragePayload, hashOfPayload);
+        // Update that we have seen this AddOncePayload so the next time it is seen it fails verification
+        if (protectedStoragePayload instanceof AddOncePayload)
+            removedAddOncePayloads.add(hashOfPayload);
 
         if (storedEntry != null) {
             // Valid remove entry, do the remove and signal listeners
@@ -769,13 +771,6 @@ public void removeInvalidProtectedStorageEntry(ProtectedStorageEntry protectedSt
         // source (network).
     }
 
-    private void maybeAddToRemoveAddOncePayloads(ProtectedStoragePayload protectedStoragePayload,
-                                                 ByteArray hashOfData) {
-        if (protectedStoragePayload instanceof AddOncePayload) {
-            removedAddOncePayloads.add(hashOfData);
-        }
-    }
-
     public ProtectedStorageEntry getProtectedStorageEntry(ProtectedStoragePayload protectedStoragePayload,
                                                           KeyPair ownerStoragePubKey)
             throws CryptoException {