From d9a7aacf98a3f2858a4eaf4fe3ea7b5b8edabeac Mon Sep 17 00:00:00 2001
From: chimp1984 <chimp1984@gmx.com>
Date: Thu, 1 Oct 2020 17:39:41 -0500
Subject: [PATCH] Update SignedWitness classes

---
 .../sign/SignedWitnessStorageService.java     | 23 ++++++++-----------
 .../core/account/sign/SignedWitnessStore.java |  9 ++------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/bisq/core/account/sign/SignedWitnessStorageService.java b/core/src/main/java/bisq/core/account/sign/SignedWitnessStorageService.java
index 722522cba7..22eea9fb19 100644
--- a/core/src/main/java/bisq/core/account/sign/SignedWitnessStorageService.java
+++ b/core/src/main/java/bisq/core/account/sign/SignedWitnessStorageService.java
@@ -22,10 +22,10 @@ import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
 import bisq.network.p2p.storage.persistence.MapStoreService;
 
 import bisq.common.config.Config;
-import bisq.common.storage.Storage;
+import bisq.common.persistence.PersistenceManager;
 
-import javax.inject.Named;
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import java.io.File;
 
@@ -33,8 +33,6 @@ import java.util.Map;
 
 import lombok.extern.slf4j.Slf4j;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 @Slf4j
 public class SignedWitnessStorageService extends MapStoreService<SignedWitnessStore, PersistableNetworkPayload> {
     private static final String FILE_NAME = "SignedWitnessStore";
@@ -46,14 +44,19 @@ public class SignedWitnessStorageService extends MapStoreService<SignedWitnessSt
 
     @Inject
     public SignedWitnessStorageService(@Named(Config.STORAGE_DIR) File storageDir,
-                                       Storage<SignedWitnessStore> persistableNetworkPayloadMapStorage) {
-        super(storageDir, persistableNetworkPayloadMapStorage);
+                                       PersistenceManager<SignedWitnessStore> persistenceManager) {
+        super(storageDir, persistenceManager);
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    @Override
+    protected void initializePersistenceManager() {
+        persistenceManager.initialize(store, PersistenceManager.Priority.LOW);
+    }
+
     @Override
     public String getFileName() {
         return FILE_NAME;
@@ -78,12 +81,4 @@ public class SignedWitnessStorageService extends MapStoreService<SignedWitnessSt
     protected SignedWitnessStore createStore() {
         return new SignedWitnessStore();
     }
-
-    @Override
-    protected void readStore() {
-        super.readStore();
-        checkArgument(store instanceof SignedWitnessStore,
-                "Store is not instance of SignedWitnessStore. That can happen if the ProtoBuffer " +
-                        "file got changed. We cleared the data store and recreated it again.");
-    }
 }
diff --git a/core/src/main/java/bisq/core/account/sign/SignedWitnessStore.java b/core/src/main/java/bisq/core/account/sign/SignedWitnessStore.java
index a1e8372f8e..d764ed3409 100644
--- a/core/src/main/java/bisq/core/account/sign/SignedWitnessStore.java
+++ b/core/src/main/java/bisq/core/account/sign/SignedWitnessStore.java
@@ -18,7 +18,6 @@
 package bisq.core.account.sign;
 
 
-import bisq.network.p2p.storage.P2PDataStorage;
 import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadStore;
 
 import com.google.protobuf.Message;
@@ -35,7 +34,7 @@ import lombok.extern.slf4j.Slf4j;
  * definition and provide a hashMap for the domain access.
  */
 @Slf4j
-public class SignedWitnessStore extends PersistableNetworkPayloadStore {
+public class SignedWitnessStore extends PersistableNetworkPayloadStore<SignedWitness> {
 
     SignedWitnessStore() {
     }
@@ -46,7 +45,7 @@ public class SignedWitnessStore extends PersistableNetworkPayloadStore {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     private SignedWitnessStore(List<SignedWitness> list) {
-        list.forEach(item -> map.put(new P2PDataStorage.ByteArray(item.getHash()), item));
+        super(list);
     }
 
     public Message toProtoMessage() {
@@ -68,8 +67,4 @@ public class SignedWitnessStore extends PersistableNetworkPayloadStore {
                 .map(SignedWitness::fromProto).collect(Collectors.toList());
         return new SignedWitnessStore(list);
     }
-
-    public boolean containsKey(P2PDataStorage.ByteArray hash) {
-        return map.containsKey(hash);
-    }
 }