Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use HistoricalDataStoreService for AccountAgeWitnessStorageService #4930

Merged
merged 3 commits into from
Dec 14, 2020
Merged

Use HistoricalDataStoreService for AccountAgeWitnessStorageService #4930

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9eb99c
Remove warning log (is logged before already)
chimp1984 Dec 10, 2020
17ec325
Use HistoricalDataStoreService for AccountAgeWitnessStorageService
chimp1984 Dec 10, 2020
9ba184e
Add AccountAgeWitness as historical data store to db update script
ripcurlx Dec 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions core/src/main/java/bisq/core/account/witness/AccountAgeWitnessStorageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@

package bisq.core.account.witness;

import bisq.network.p2p.storage.P2PDataStorage;
import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.network.p2p.storage.persistence.MapStoreService;
import bisq.network.p2p.storage.persistence.HistoricalDataStoreService;

import bisq.common.config.Config;
import bisq.common.persistence.PersistenceManager;
Expand All @@ -29,12 +28,10 @@

import java.io.File;

import java.util.Map;

import lombok.extern.slf4j.Slf4j;

@Slf4j
public class AccountAgeWitnessStorageService extends MapStoreService<AccountAgeWitnessStore, PersistableNetworkPayload> {
public class AccountAgeWitnessStorageService extends HistoricalDataStoreService<AccountAgeWitnessStore> {
private static final String FILE_NAME = "AccountAgeWitnessStore";


Expand All @@ -48,23 +45,19 @@ public AccountAgeWitnessStorageService(@Named(Config.STORAGE_DIR) File storageDi
super(storageDir, persistenceManager);
}


///////////////////////////////////////////////////////////////////////////////////////////
// API
///////////////////////////////////////////////////////////////////////////////////////////

@Override
protected void initializePersistenceManager() {
persistenceManager.initialize(store, PersistenceManager.Source.NETWORK);
}

@Override
public String getFileName() {
return FILE_NAME;
}

@Override
public Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> getMap() {
return store.getMap();
protected void initializePersistenceManager() {
persistenceManager.initialize(store, PersistenceManager.Source.NETWORK);
}

@Override
Expand Down
5 changes: 1 addition & 4 deletions p2p/src/main/java/bisq/network/p2p/storage/persistence/HistoricalDataStoreService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,7 @@ private void readHistoricalStoreFromResources(String version,
pruneStore(persisted, version);
completeHandler.run();
},
() -> {
log.warn("Resource file with file name {} does not exits.", fileName);
completeHandler.run();
});
completeHandler::run);
}

private void pruneStore(PersistableNetworkPayloadStore<? extends PersistableNetworkPayload> historicalStore,
Expand Down