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.

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

Redesign dao state monitoring [4] #5782

Merged
merged 13 commits into from Nov 9, 2021
Expand Up @@ -369,7 +369,7 @@ private void processPeersDaoStateHashes(List<DaoStateHash> stateHashes, Optional
stateHashes.forEach(peersHash -> {
Optional<DaoStateBlock> optionalDaoStateBlock;
// If we do not add own hashes during initial parsing we fill the missing hashes from the peer and create
// the at the last block our own hash.
// at the last block our own hash.
int height = peersHash.getHeight();
if (!useDaoMonitor &&
!findDaoStateBlock(height).isPresent()) {
Expand Down
Expand Up @@ -138,7 +138,7 @@ public void onParseBlockChainComplete() {
// snapshot height as we have not cloned a candidate (that would cause quite some delay during parsing).
// The next snapshots will be created again according to the snapshot height grid (each 20 blocks).
// This also comes with the improvement that the user does not need to load the past blocks back to the last
// snapshot height. Thought it comes also with the small risk that in case of re-orgs the user need to do
// snapshot height. Though it comes also with the small risk that in case of re-orgs the user need to do
// a resync in case the dao state would have been affected by that reorg.
long ts = System.currentTimeMillis();
// We do not keep a copy of the clone as we use it immediately for persistence.
Expand Down
Expand Up @@ -82,7 +82,6 @@ public TradeStatisticsManager(P2PService p2PService,
this.storageDir = storageDir;
this.dumpStatistics = dumpStatistics;


appendOnlyDataStoreService.addService(tradeStatistics3StorageService);
}

Expand Down
Expand Up @@ -138,7 +138,7 @@ public void requestFromAllServices(Consumer<AssetTxProofResult> resultHandler, F

// We set serviceAddresses at request time. If user changes AutoConfirmSettings after request has started
// it will have no impact on serviceAddresses and numRequiredSuccessResults.
// Thought numRequiredConfirmations can be changed during request process and will be read from
// Though numRequiredConfirmations can be changed during request process and will be read from
// autoConfirmSettings at result parsing.
List<String> serviceAddresses = autoConfirmSettings.getServiceAddresses();
numRequiredSuccessResults = serviceAddresses.size();
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/i18n/displayStrings.properties
Expand Up @@ -2531,7 +2531,7 @@ dao.monitor.isInConflictWithSeedNode=Your local data is not in consensus with at
Please resync the DAO state.
dao.monitor.isInConflictWithNonSeedNode=One of your peers is not in consensus with the network but your node \
is in sync with the seed nodes.
dao.monitor.isDaoStateBlockChainNotConnecting=You dao state chain is not connecting with the new data. \
dao.monitor.isDaoStateBlockChainNotConnecting=Your DAO state chain is not connecting with the new data. \
Please resync the DAO state.
dao.monitor.daoStateInSync=Your local node is in consensus with the network

Expand Down
Expand Up @@ -332,7 +332,6 @@ public void updateItem(final BLI item, boolean empty) {
tableView.getSortOrder().add(column);
tableView.getColumns().add(column);


column = new AutoTooltipTableColumn<>(getHashTableHeader());
column.setMinWidth(120);
column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue()));
Expand Down Expand Up @@ -381,7 +380,6 @@ public void updateItem(final BLI item, boolean empty) {
column.setComparator(Comparator.comparing(e -> e.getStateBlock().getPeersMap().size()));
tableView.getColumns().add(column);


column = new AutoTooltipTableColumn<>(getConflictsTableHeader());
column.setMinWidth(80);
column.setMaxWidth(column.getMinWidth());
Expand All @@ -406,7 +404,6 @@ public void updateItem(final BLI item, boolean empty) {
column.setComparator(Comparator.comparing(e -> e.getStateBlock().getInConflictMap().size()));
tableView.getColumns().add(column);


column = new AutoTooltipTableColumn<>("");
column.setMinWidth(40);
column.setMaxWidth(column.getMinWidth());
Expand Down
Expand Up @@ -216,7 +216,6 @@ public void updateItem(BlindVoteStateBlockListItem item, boolean empty) {
tableView.getColumns().add(1, column);
}


protected void createConflictColumns() {
super.createConflictColumns();

Expand Down
Expand Up @@ -214,7 +214,6 @@ public void updateItem(ProposalStateBlockListItem item, boolean empty) {
tableView.getColumns().add(1, column);
}


protected void createConflictColumns() {
super.createConflictColumns();

Expand Down