[REFACTOR] Clean up ClientAPI for refreshTTL

Remove isDataOwner from the client API. All users pass in true. All test users don't care.
bisq-network · Nov 23, 2019 · 34a9921 · 34a9921
1 parent a824386
commit 34a9921
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/core/src/main/java/bisq/core/offer/OfferBookService.java b/core/src/main/java/bisq/core/offer/OfferBookService.java
@@ -164,7 +164,7 @@ public void refreshTTL(OfferPayload offerPayload,
             return;
         }
 
-        boolean result = p2PService.refreshTTL(offerPayload, true);
+        boolean result = p2PService.refreshTTL(offerPayload);
         if (result) {
             resultHandler.handleResult();
         } else {

diff --git a/p2p/src/main/java/bisq/network/p2p/P2PService.java b/p2p/src/main/java/bisq/network/p2p/P2PService.java
@@ -796,11 +796,11 @@ public boolean addProtectedStorageEntry(ProtectedStoragePayload protectedStorage
         }
     }
 
-    public boolean refreshTTL(ProtectedStoragePayload protectedStoragePayload, boolean isDataOwner) {
+    public boolean refreshTTL(ProtectedStoragePayload protectedStoragePayload) {
         if (isBootstrapped()) {
             try {
                 RefreshOfferMessage refreshTTLMessage = p2PDataStorage.getRefreshTTLMessage(protectedStoragePayload, keyRing.getSignatureKeyPair());
-                return p2PDataStorage.refreshTTL(refreshTTLMessage, networkNode.getNodeAddress(), isDataOwner);
+                return p2PDataStorage.refreshTTL(refreshTTLMessage, networkNode.getNodeAddress());
             } catch (CryptoException e) {
                 log.error("Signing at getDataWithSignedSeqNr failed. That should never happen.");
                 return false;

diff --git a/p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java b/p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java
@@ -648,7 +648,19 @@ private void broadcastProtectedStorageEntry(ProtectedStorageEntry protectedStora
         broadcast(new AddDataMessage(protectedStorageEntry), sender, broadcastListener, isDataOwner);
     }
 
+    /**
+     * Updates a local RefreshOffer with TTL changes and broadcasts those changes to the network
+     *
+     * @param refreshTTLMessage refreshTTLMessage containing the update
+     * @param sender local NodeAddress, if available
+     * @return <code>true</code> if the RefreshOffer was successfully updated and changes broadcast
+     */
     public boolean refreshTTL(RefreshOfferMessage refreshTTLMessage,
+                              @Nullable NodeAddress sender) {
+        return refreshTTL(refreshTTLMessage, sender, true);
+    }
+
+    private boolean refreshTTL(RefreshOfferMessage refreshTTLMessage,
                               @Nullable NodeAddress sender,
                               boolean isDataOwner) {
 

diff --git a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageClientAPITest.java b/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageClientAPITest.java
@@ -123,7 +123,7 @@ public void getRefreshTTLMessage_NoExists() throws NoSuchAlgorithmException, Cry
         RefreshOfferMessage refreshOfferMessage = this.testState.mockedStorage.getRefreshTTLMessage(protectedStoragePayload, ownerKeys);
 
         SavedTestState beforeState = this.testState.saveTestState(refreshOfferMessage);
-        Assert.assertFalse(this.testState.mockedStorage.refreshTTL(refreshOfferMessage, TestState.getTestNodeAddress(), true));
+        Assert.assertFalse(this.testState.mockedStorage.refreshTTL(refreshOfferMessage, TestState.getTestNodeAddress()));
 
         this.testState.verifyRefreshTTL(beforeState, refreshOfferMessage, false, true);
     }
@@ -138,14 +138,14 @@ public void getRefreshTTLMessage() throws NoSuchAlgorithmException, CryptoExcept
         this.testState.mockedStorage.addProtectedStorageEntry(protectedStorageEntry, TestState.getTestNodeAddress(), null);
 
         RefreshOfferMessage refreshOfferMessage = this.testState.mockedStorage.getRefreshTTLMessage(protectedStoragePayload, ownerKeys);
-        this.testState.mockedStorage.refreshTTL(refreshOfferMessage, TestState.getTestNodeAddress(), true);
+        this.testState.mockedStorage.refreshTTL(refreshOfferMessage, TestState.getTestNodeAddress());
 
         refreshOfferMessage = this.testState.mockedStorage.getRefreshTTLMessage(protectedStoragePayload, ownerKeys);
 
         this.testState.incrementClock();
 
         SavedTestState beforeState = this.testState.saveTestState(refreshOfferMessage);
-        Assert.assertTrue(this.testState.mockedStorage.refreshTTL(refreshOfferMessage, TestState.getTestNodeAddress(), true));
+        Assert.assertTrue(this.testState.mockedStorage.refreshTTL(refreshOfferMessage, TestState.getTestNodeAddress()));
 
         this.testState.verifyRefreshTTL(beforeState, refreshOfferMessage, true, true);
     }
@@ -169,7 +169,7 @@ public void getRefreshTTLMessage_FirstOnMessageSecondAPI() throws NoSuchAlgorith
         this.testState.incrementClock();
 
         SavedTestState beforeState = this.testState.saveTestState(refreshOfferMessage);
-        Assert.assertTrue(this.testState.mockedStorage.refreshTTL(refreshOfferMessage, TestState.getTestNodeAddress(), true));
+        Assert.assertTrue(this.testState.mockedStorage.refreshTTL(refreshOfferMessage, TestState.getTestNodeAddress()));
 
         this.testState.verifyRefreshTTL(beforeState, refreshOfferMessage, true, true);
     }

diff --git a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageProtectedStorageEntryTest.java b/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageProtectedStorageEntryTest.java
@@ -146,8 +146,7 @@ boolean doRefreshTTL(RefreshOfferMessage refreshOfferMessage) {
 
                 return true;
             } else {
-                // XXX: All external callers just pass in true for isDataOwner a future patch can remove the argument.
-                return this.testState.mockedStorage.refreshTTL(refreshOfferMessage, TestState.getTestNodeAddress(), true);
+                return this.testState.mockedStorage.refreshTTL(refreshOfferMessage, TestState.getTestNodeAddress());
             }
         }