(1/8) [TESTS] Add tests for P2PDataStorage in order to safely refactor

p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java

@@ -808,7 +808,7 @@ private void broadcast(BroadcastMessage message, @Nullable NodeAddress sender,
         broadcaster.broadcast(message, sender, listener, isDataOwner);
     }
 
-    private ByteArray get32ByteHashAsByteArray(NetworkPayload data) {
+    public static ByteArray get32ByteHashAsByteArray(NetworkPayload data) {
         return new ByteArray(P2PDataStorage.get32ByteHash(data));
     }
 

p2p/src/test/java/bisq/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java

@@ -0,0 +1,42 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.network.p2p.storage.mocks;
+
+import bisq.network.p2p.storage.P2PDataStorage;
+import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
+import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class AppendOnlyDataStoreServiceFake extends AppendOnlyDataStoreService {
+    private final Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> map;
+
+    public AppendOnlyDataStoreServiceFake() {
+        super(null);
+        map = new HashMap<>();
+    }
+
+    public Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> getMap() {
+        return map;
+    }
+
+    public void put(P2PDataStorage.ByteArray hashAsByteArray, PersistableNetworkPayload payload) {
+        map.put(hashAsByteArray, payload);
+    }
+}

p2p/src/test/java/bisq/network/p2p/storage/mocks/DateTolerantPayloadStub.java

@@ -0,0 +1,50 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.network.p2p.storage.mocks;
+
+import bisq.network.p2p.storage.payload.DateTolerantPayload;
+
+import java.time.Clock;
+
+public class DateTolerantPayloadStub implements DateTolerantPayload {
+    private final boolean dateInTolerance;
+
+    public DateTolerantPayloadStub(boolean dateInTolerance) {
+        this.dateInTolerance = dateInTolerance;
+    }
+
+    @Override
+    public boolean isDateInTolerance(Clock clock) {
+        return this.dateInTolerance;
+    }
+
+    @Override
+    public protobuf.PersistableNetworkPayload toProtoMessage() {
+        throw new UnsupportedOperationException("Stub does not support protobuf");
+    }
+
+    @Override
+    public byte[] getHash() {
+        return new byte[] { 1 };
+    }
+
+    @Override
+    public boolean verifyHashSize() {
+        return true;
+    }
+}

p2p/src/test/java/bisq/network/p2p/storage/mocks/PersistableNetworkPayloadStub.java

@@ -0,0 +1,43 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.network.p2p.storage.mocks;
+
+import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
+
+public class PersistableNetworkPayloadStub implements PersistableNetworkPayload {
+    private final boolean hashSizeValid;
+
+    public PersistableNetworkPayloadStub(boolean hashSizeValid) {
+        this.hashSizeValid = hashSizeValid;
+    }
+
+    @Override
+    public protobuf.PersistableNetworkPayload toProtoMessage() {
+        throw new UnsupportedOperationException("Stub does not support protobuf");
+    }
+
+    @Override
+    public byte[] getHash() {
+        return new byte[] { 1 };
+    }
+
+    @Override
+    public boolean verifyHashSize() {
+        return this.hashSizeValid;
+    }
+}

p2p/src/test/java/bisq/network/p2p/storage/mocks/ProtectedDataStoreServiceFake.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.network.p2p.storage.mocks;
+
+import bisq.network.p2p.storage.P2PDataStorage;
+import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
+import bisq.network.p2p.storage.persistence.ProtectedDataStoreService;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ProtectedDataStoreServiceFake extends ProtectedDataStoreService {
+    private final Map<P2PDataStorage.ByteArray, ProtectedStorageEntry> map;
+
+    public ProtectedDataStoreServiceFake() {
+        super();
+        map = new HashMap<>();
+    }
+
+    public Map<P2PDataStorage.ByteArray, ProtectedStorageEntry> getMap() {
+        return map;
+    }
+
+    public void put(P2PDataStorage.ByteArray hashAsByteArray, ProtectedStorageEntry entry) {
+        map.put(hashAsByteArray, entry);
+    }
+    public ProtectedStorageEntry remove(P2PDataStorage.ByteArray hash, ProtectedStorageEntry protectedStorageEntry) {
+        return map.remove(hash);
+    }
+}

p2p/src/test/java/bisq/network/p2p/storage/mocks/ProtectedStoragePayloadStub.java

@@ -0,0 +1,64 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.network.p2p.storage.mocks;
+
+import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
+
+import bisq.common.crypto.Sig;
+
+import com.google.protobuf.Message;
+
+import java.security.PublicKey;
+
+import java.util.Map;
+
+import lombok.Getter;
+
+import javax.annotation.Nullable;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/*
+ * Stub ProtectedStoragePayload whose hash is equal to the ownerPubKey
+ */
+public class ProtectedStoragePayloadStub implements ProtectedStoragePayload {
+    @Getter
+    private PublicKey ownerPubKey;
+
+    private Message messageMock;
+
+    public ProtectedStoragePayloadStub(PublicKey ownerPubKey) {
+        this.ownerPubKey = ownerPubKey;
+
+        // Need to be able to take the hash which leverages protobuf Messages
+        this.messageMock = mock(protobuf.StoragePayload.class);
+        when(this.messageMock.toByteArray()).thenReturn(Sig.getPublicKeyBytes(ownerPubKey));
+    }
+
+    @Nullable
+    @Override
+    public Map<String, String> getExtraDataMap() {
+        return null;
+    }
+
+    @Override
+    public Message toProtoMessage() {
+        return this.messageMock;
+    }
+}

p2p/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

@@ -0,0 +1 @@
+mock-maker-inline # allow mocking of final classes in tests