diff --git a/core/src/main/java/bisq/core/dao/DaoFacade.java b/core/src/main/java/bisq/core/dao/DaoFacade.java index 75e77bccb3..d2a433cd2b 100644 --- a/core/src/main/java/bisq/core/dao/DaoFacade.java +++ b/core/src/main/java/bisq/core/dao/DaoFacade.java @@ -55,7 +55,6 @@ import bisq.core.dao.governance.proposal.role.RoleProposalFactory; import bisq.core.dao.state.DaoStateListener; import bisq.core.dao.state.DaoStateService; import bisq.core.dao.state.DaoStateStorageService; -import bisq.core.dao.state.model.blockchain.Block; import bisq.core.dao.state.model.blockchain.Tx; import bisq.core.dao.state.model.blockchain.TxOutput; import bisq.core.dao.state.model.blockchain.TxOutputKey; @@ -188,10 +187,6 @@ public class DaoFacade implements DaoSetupService { periodService.getCurrentCycle().getPhaseForHeight(blockHeight).ifPresent(phaseProperty::set); } - @Override - public void onParseTxsCompleteAfterBatchProcessing(Block block) { - } - @Override public void onParseBlockChainComplete() { } diff --git a/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVoteListService.java b/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVoteListService.java index 5d1c752ce3..8d008eed41 100644 --- a/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVoteListService.java +++ b/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVoteListService.java @@ -23,7 +23,6 @@ import bisq.core.dao.governance.blindvote.storage.BlindVotePayload; import bisq.core.dao.governance.blindvote.storage.BlindVoteStorageService; import bisq.core.dao.state.DaoStateListener; import bisq.core.dao.state.DaoStateService; -import bisq.core.dao.state.model.blockchain.Block; import bisq.network.p2p.P2PService; import bisq.network.p2p.storage.payload.PersistableNetworkPayload; @@ -98,10 +97,6 @@ public class BlindVoteListService implements AppendOnlyDataStoreListener, DaoSta public void onNewBlockHeight(int blockHeight) { } - @Override - public void onParseTxsCompleteAfterBatchProcessing(Block block) { - } - @Override public void onParseBlockChainComplete() { fillListFromAppendOnlyDataStore(); diff --git a/core/src/main/java/bisq/core/dao/governance/blindvote/MyBlindVoteListService.java b/core/src/main/java/bisq/core/dao/governance/blindvote/MyBlindVoteListService.java index b2da58e753..05541280fe 100644 --- a/core/src/main/java/bisq/core/dao/governance/blindvote/MyBlindVoteListService.java +++ b/core/src/main/java/bisq/core/dao/governance/blindvote/MyBlindVoteListService.java @@ -35,7 +35,6 @@ import bisq.core.dao.governance.period.PeriodService; import bisq.core.dao.governance.proposal.MyProposalListService; import bisq.core.dao.state.DaoStateListener; import bisq.core.dao.state.DaoStateService; -import bisq.core.dao.state.model.blockchain.Block; import bisq.core.dao.state.model.governance.BallotList; import bisq.core.dao.state.model.governance.CompensationProposal; import bisq.core.dao.state.model.governance.DaoPhase; @@ -176,10 +175,6 @@ public class MyBlindVoteListService implements PersistedDataHost, DaoStateListen public void onNewBlockHeight(int blockHeight) { } - @Override - public void onParseTxsCompleteAfterBatchProcessing(Block block) { - } - @Override public void onParseBlockChainComplete() { rePublishOnceWellConnected(); diff --git a/core/src/main/java/bisq/core/dao/governance/period/CycleService.java b/core/src/main/java/bisq/core/dao/governance/period/CycleService.java index e36f26af55..53b4998609 100644 --- a/core/src/main/java/bisq/core/dao/governance/period/CycleService.java +++ b/core/src/main/java/bisq/core/dao/governance/period/CycleService.java @@ -22,7 +22,6 @@ import bisq.core.dao.governance.param.Param; import bisq.core.dao.state.DaoStateListener; import bisq.core.dao.state.DaoStateService; import bisq.core.dao.state.GenesisTxInfo; -import bisq.core.dao.state.model.blockchain.Block; import bisq.core.dao.state.model.governance.Cycle; import bisq.core.dao.state.model.governance.DaoPhase; @@ -83,10 +82,6 @@ public class CycleService implements DaoStateListener, DaoSetupService { .ifPresent(daoStateService.getCycles()::add); } - @Override - public void onParseTxsCompleteAfterBatchProcessing(Block block) { - } - @Override public void onParseBlockChainComplete() { } diff --git a/core/src/main/java/bisq/core/dao/governance/proposal/MyProposalListService.java b/core/src/main/java/bisq/core/dao/governance/proposal/MyProposalListService.java index 952a623de2..4dae984c21 100644 --- a/core/src/main/java/bisq/core/dao/governance/proposal/MyProposalListService.java +++ b/core/src/main/java/bisq/core/dao/governance/proposal/MyProposalListService.java @@ -25,7 +25,6 @@ import bisq.core.dao.governance.period.PeriodService; import bisq.core.dao.governance.proposal.storage.temp.TempProposalPayload; import bisq.core.dao.state.DaoStateListener; import bisq.core.dao.state.DaoStateService; -import bisq.core.dao.state.model.blockchain.Block; import bisq.core.dao.state.model.blockchain.Tx; import bisq.core.dao.state.model.governance.DaoPhase; import bisq.core.dao.state.model.governance.Proposal; @@ -125,10 +124,6 @@ public class MyProposalListService implements PersistedDataHost, DaoStateListene public void onNewBlockHeight(int blockHeight) { } - @Override - public void onParseTxsCompleteAfterBatchProcessing(Block block) { - } - @Override public void onParseBlockChainComplete() { rePublishOnceWellConnected(); diff --git a/core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultService.java b/core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultService.java index 73e4bdfd3e..c0c8eea28b 100644 --- a/core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultService.java +++ b/core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultService.java @@ -33,7 +33,6 @@ import bisq.core.dao.governance.votereveal.VoteRevealConsensus; import bisq.core.dao.governance.votereveal.VoteRevealService; import bisq.core.dao.state.DaoStateListener; import bisq.core.dao.state.DaoStateService; -import bisq.core.dao.state.model.blockchain.Block; import bisq.core.dao.state.model.blockchain.Tx; import bisq.core.dao.state.model.blockchain.TxOutput; import bisq.core.dao.state.model.governance.Ballot; @@ -155,10 +154,6 @@ public class VoteResultService implements DaoStateListener, DaoSetupService { maybeCalculateVoteResult(blockHeight); } - @Override - public void onParseTxsCompleteAfterBatchProcessing(Block block) { - } - @Override public void onParseBlockChainComplete() { } diff --git a/core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java b/core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java index e24b00e121..5a2aea27c5 100644 --- a/core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java +++ b/core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java @@ -36,7 +36,6 @@ import bisq.core.dao.node.BsqNode; import bisq.core.dao.node.BsqNodeProvider; import bisq.core.dao.state.DaoStateListener; import bisq.core.dao.state.DaoStateService; -import bisq.core.dao.state.model.blockchain.Block; import bisq.core.dao.state.model.blockchain.TxOutput; import bisq.core.dao.state.model.governance.DaoPhase; @@ -157,10 +156,6 @@ public class VoteRevealService implements DaoStateListener, DaoSetupService { maybeRevealVotes(); } - @Override - public void onParseTxsCompleteAfterBatchProcessing(Block block) { - } - @Override public void onParseBlockChainComplete() { } diff --git a/core/src/main/java/bisq/core/dao/state/DaoStateListener.java b/core/src/main/java/bisq/core/dao/state/DaoStateListener.java index e8364bb36e..dd53855783 100644 --- a/core/src/main/java/bisq/core/dao/state/DaoStateListener.java +++ b/core/src/main/java/bisq/core/dao/state/DaoStateListener.java @@ -22,14 +22,15 @@ import bisq.core.dao.state.model.blockchain.Block; public interface DaoStateListener { void onNewBlockHeight(int blockHeight); - void onParseTxsCompleteAfterBatchProcessing(Block block); - void onParseBlockChainComplete(); // Never used but we still want to provide the event default void onEmptyBlockAdded(Block block) { } + default void onParseTxsCompleteAfterBatchProcessing(Block block) { + } + default void onParseTxsComplete(Block block, boolean parseBlockChainComplete) { } } diff --git a/core/src/main/java/bisq/core/dao/state/DaoStateSnapshotService.java b/core/src/main/java/bisq/core/dao/state/DaoStateSnapshotService.java index 02ee33139b..e2eedfe9e5 100644 --- a/core/src/main/java/bisq/core/dao/state/DaoStateSnapshotService.java +++ b/core/src/main/java/bisq/core/dao/state/DaoStateSnapshotService.java @@ -74,10 +74,6 @@ public class DaoStateSnapshotService implements DaoStateListener { public void onNewBlockHeight(int blockHeight) { } - @Override - public void onParseTxsCompleteAfterBatchProcessing(Block block) { - } - // We listen to each ParseTxsComplete event even the batch processing of all blocks at startup is not completed // as we need to write snapshots during that batch processing. @Override diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/PhasesView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/PhasesView.java index b3a702a4d0..14d9dbbb82 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/governance/PhasesView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/governance/PhasesView.java @@ -22,7 +22,6 @@ import bisq.desktop.util.Layout; import bisq.core.dao.DaoFacade; import bisq.core.dao.state.DaoStateListener; -import bisq.core.dao.state.model.blockchain.Block; import bisq.core.dao.state.model.governance.DaoPhase; import bisq.core.locale.Res; @@ -96,10 +95,6 @@ public class PhasesView implements DaoStateListener { applyData(height); } - @Override - public void onParseTxsCompleteAfterBatchProcessing(Block block) { - } - @Override public void onParseBlockChainComplete() { } diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/dashboard/GovernanceDashboardView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/dashboard/GovernanceDashboardView.java index 25a21c25bb..5c68738af4 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/governance/dashboard/GovernanceDashboardView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/governance/dashboard/GovernanceDashboardView.java @@ -25,7 +25,6 @@ import bisq.desktop.util.Layout; import bisq.core.dao.DaoFacade; import bisq.core.dao.state.DaoStateListener; -import bisq.core.dao.state.model.blockchain.Block; import bisq.core.dao.state.model.governance.DaoPhase; import bisq.core.locale.Res; import bisq.core.util.BSFormatter; @@ -111,10 +110,6 @@ public class GovernanceDashboardView extends ActivatableView imp applyData(height); } - @Override - public void onParseTxsCompleteAfterBatchProcessing(Block block) { - } - @Override public void onParseBlockChainComplete() { } diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java index 8faa5d394c..d2f66c6478 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java @@ -38,7 +38,6 @@ import bisq.core.dao.governance.proposal.ProposalWithTransaction; import bisq.core.dao.governance.proposal.TxException; import bisq.core.dao.governance.proposal.param.ChangeParamValidator; import bisq.core.dao.state.DaoStateListener; -import bisq.core.dao.state.model.blockchain.Block; import bisq.core.dao.state.model.governance.DaoPhase; import bisq.core.dao.state.model.governance.Proposal; import bisq.core.dao.state.model.governance.Role; @@ -187,10 +186,6 @@ public class MakeProposalView extends ActivatableView implements proposalTypeComboBox.getSelectionModel().clearSelection(); } - @Override - public void onParseTxsCompleteAfterBatchProcessing(Block block) { - } - @Override public void onParseBlockChainComplete() { } diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java index 7100a2b2a3..81e8a08c6b 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java @@ -184,10 +184,6 @@ public class VoteResultView extends ActivatableView implements D fillCycleList(); } - @Override - public void onParseTxsCompleteAfterBatchProcessing(Block block) { - } - @Override public void onParseBlockChainComplete() { }