Merge pull request #4159 from stejbac/remove-unused-PersistableEnvelo…

…pe-types

Remove PersistableNetworkPayloadList & TradeStatisticsList

core/src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java

@@ -43,7 +43,6 @@
 import bisq.core.user.UserPayload;
 
 import bisq.network.p2p.peers.peerexchange.PeerList;
-import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadList;
 import bisq.network.p2p.storage.persistence.SequenceNumberMap;
 
 import bisq.common.config.Config;
@@ -101,8 +100,6 @@ public PersistableEnvelope fromProto(protobuf.PersistableEnvelope proto) {
                             this,
                             new Storage<>(storageDir, this, corruptedDatabaseFilesHandler),
                             btcWalletService.get());
-                case TRADE_STATISTICS_LIST:
-                    throw new ProtobufferRuntimeException("TRADE_STATISTICS_LIST is not used anymore");
                 case ARBITRATION_DISPUTE_LIST:
                     return ArbitrationDisputeList.fromProto(proto.getArbitrationDisputeList(),
                             this,
@@ -123,8 +120,6 @@ public PersistableEnvelope fromProto(protobuf.PersistableEnvelope proto) {
                     return NavigationPath.fromProto(proto.getNavigationPath());
                 case PAYMENT_ACCOUNT_LIST:
                     return PaymentAccountList.fromProto(proto.getPaymentAccountList(), this);
-                case PERSISTABLE_NETWORK_PAYLOAD_LIST:
-                    return PersistableNetworkPayloadList.fromProto(proto.getPersistableNetworkPayloadList(), this);
                 case ACCOUNT_AGE_WITNESS_STORE:
                     return AccountAgeWitnessStore.fromProto(proto.getAccountAgeWitnessStore());
                 case TRADE_STATISTICS2_STORE:

p2p/src/main/java/bisq/network/p2p/P2PModule.java

@@ -28,7 +28,6 @@
 import bisq.network.p2p.peers.peerexchange.PeerExchangeManager;
 import bisq.network.p2p.storage.P2PDataStorage;
 import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService;
-import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadListService;
 import bisq.network.p2p.storage.persistence.ProtectedDataStoreService;
 import bisq.network.p2p.storage.persistence.ResourceDataStoreService;
 
@@ -62,7 +61,6 @@ protected void configure() {
         bind(P2PDataStorage.class).in(Singleton.class);
         bind(AppendOnlyDataStoreService.class).in(Singleton.class);
         bind(ProtectedDataStoreService.class).in(Singleton.class);
-        bind(PersistableNetworkPayloadListService.class).in(Singleton.class);
         bind(ResourceDataStoreService.class).in(Singleton.class);
         bind(RequestDataManager.class).in(Singleton.class);
         bind(PeerExchangeManager.class).in(Singleton.class);

p2p/src/main/java/bisq/network/p2p/storage/persistence/AppendOnlyDataStoreService.java

@@ -38,20 +38,13 @@
 public class AppendOnlyDataStoreService {
     private List<MapStoreService<? extends PersistableEnvelope, PersistableNetworkPayload>> services = new ArrayList<>();
 
-    // We do not add PersistableNetworkPayloadListService to the services list as it it deprecated and used only to
-    // transfer old persisted data to the new data structure.
-    @SuppressWarnings("deprecation")
-    private PersistableNetworkPayloadListService persistableNetworkPayloadListService;
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    @SuppressWarnings("deprecation")
     @Inject
-    public AppendOnlyDataStoreService(PersistableNetworkPayloadListService persistableNetworkPayloadListService) {
-        this.persistableNetworkPayloadListService = persistableNetworkPayloadListService;
+    public AppendOnlyDataStoreService() {
     }
 
     public void addService(MapStoreService<? extends PersistableEnvelope, PersistableNetworkPayload> service) {
@@ -60,19 +53,6 @@ public void addService(MapStoreService<? extends PersistableEnvelope, Persistabl
 
     public void readFromResources(String postFix) {
         services.forEach(service -> service.readFromResources(postFix));
-
-        // transferDeprecatedDataStructure();
-    }
-
-    // Only needed for one time converting the old data store to the new ones. Can be removed after next release when we
-    // are sure that no issues occurred.
-    private void transferDeprecatedDataStructure() {
-        // We read the file if it exists in the db folder
-        persistableNetworkPayloadListService.readStore();
-        // Transfer the content to the new services
-        persistableNetworkPayloadListService.getMap().forEach(this::put);
-        // We are done with the transfer, now let's remove the file
-        persistableNetworkPayloadListService.removeFile();
     }
 
     public Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> getMap() {

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

@@ -34,7 +34,6 @@ public class AppendOnlyDataStoreServiceFake extends AppendOnlyDataStoreService {
     private final Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> map;
 
     public AppendOnlyDataStoreServiceFake() {
-        super(null);
         map = new HashMap<>();
     }
 

proto/src/main/proto/pb.proto

@@ -1115,7 +1115,7 @@ message PersistableEnvelope {
         NavigationPath navigation_path = 5;
 
         TradableList tradable_list = 6;
-        TradeStatisticsList trade_statistics_list = 7 [deprecated = true]; // Was used in pre v0.6.0 version. Not used anymore.
+        // TradeStatisticsList trade_statistics_list = 7; // Was used in pre v0.6.0 version. Not used anymore.
         ArbitrationDisputeList arbitration_dispute_list = 8;
 
         PreferencesPayload preferences_payload = 9;
@@ -1128,10 +1128,7 @@ message PersistableEnvelope {
         AccountAgeWitnessStore account_age_witness_store = 13;
         TradeStatistics2Store trade_statistics2_store = 14;
 
-        // we need to keep id 15 here otherwise the reading of the old data structure would not work anymore.
-        // can be removed after most people have updated as the reading of the PersistableNetworkPayloadList
-        // is not mandatory.
-        PersistableNetworkPayloadList persistable_network_payload_list = 15 [deprecated = true];
+        // PersistableNetworkPayloadList persistable_network_payload_list = 15; // long deprecated & migration away from it is already done
 
         ProposalStore proposal_store = 16;
         TempProposalStore temp_proposal_store = 17;
@@ -1178,11 +1175,6 @@ message PersistedEntryMap {
     map<string, ProtectedStorageEntry> persisted_entry_map = 1;
 }
 
-// deprecated. Not used anymore.
-message PersistableNetworkPayloadList {
-    repeated PersistableNetworkPayload items = 1;
-}
-
 // We use a list not a hash map to save disc space. The hash can be calculated from the payload anyway
 message AccountAgeWitnessStore {
     repeated AccountAgeWitness items = 1;
@@ -1239,11 +1231,6 @@ message TradableList {
     repeated Tradable tradable = 1;
 }
 
-// deprecated  Was used in pre v0.6.0 version. Not used anymore but leave it as it is used in PersistableEnvelope
-message TradeStatisticsList {
-    repeated TradeStatistics trade_statistics = 1;
-}
-
 message Offer {
     enum State {
         PB_ERROR = 0;