Merge pull request #6740 from HenrikJannsen/rename_bm_accounting_store

Use new burningman accounting file recreated from scratch.
bisq-network · Jun 28, 2023 · 8c70dd6 · 8c70dd6
2 parents edfa035 + e54ed37
commit 8c70dd6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/...in/java/bisq/core/dao/burningman/accounting/storage/BurningManAccountingStoreService.java b/...in/java/bisq/core/dao/burningman/accounting/storage/BurningManAccountingStoreService.java
@@ -24,14 +24,19 @@
 import bisq.network.p2p.storage.persistence.ResourceDataStoreService;
 import bisq.network.p2p.storage.persistence.StoreService;
 
+import bisq.common.UserThread;
 import bisq.common.config.Config;
+import bisq.common.file.FileUtil;
 import bisq.common.persistence.PersistenceManager;
 
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
+import java.nio.file.Path;
+
 import java.io.File;
+import java.io.IOException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,7 +48,7 @@
 @Slf4j
 @Singleton
 public class BurningManAccountingStoreService extends StoreService<BurningManAccountingStore> {
-    private static final String FILE_NAME = "BurningManAccountingStore";
+    private static final String FILE_NAME = "BurningManAccountingStore_v2";
 
     @Inject
     public BurningManAccountingStoreService(ResourceDataStoreService resourceDataStoreService,
@@ -54,6 +59,19 @@ public BurningManAccountingStoreService(ResourceDataStoreService resourceDataSto
         resourceDataStoreService.addService(this);
     }
 
+    protected void readFromResources(String postFix, Runnable completeHandler) {
+        super.readFromResources(postFix, completeHandler);
+
+        UserThread.runAfter(() -> {
+            try {
+                // Delete old BurningManAccountingStore file which was missing some data.
+                FileUtil.deleteFileIfExists(Path.of(absolutePathOfStorageDir, "BurningManAccountingStore").toFile());
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }, 5);
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // API
@@ -100,7 +118,7 @@ protected BurningManAccountingStore createStore() {
 
     @Override
     protected void initializePersistenceManager() {
-        persistenceManager.initialize(store, PersistenceManager.Source.NETWORK);
+        persistenceManager.initialize(store, FILE_NAME, PersistenceManager.Source.NETWORK);
     }
 
     @Override

diff --git a/...ces/BurningManAccountingStore_BTC_MAINNET → .../BurningManAccountingStore_v2_BTC_MAINNET b/...ces/BurningManAccountingStore_BTC_MAINNET → .../BurningManAccountingStore_v2_BTC_MAINNET