mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactoring

Browse source 
- Add PeriodStateMutator to guice module
- Add ConsensusServicesSetup and PresentationServicesSetup
- Separate code from onAllServicesInitialized into listener registration and start method
- Move MyProposalService and ProposalListService to bisq.core.dao.presentation.proposal (WIP)
- Add PresentationService marker interface
- Rename PHASE_ISSUANCE to PHASE_VOTE_RESULT
- Remove onInitialState from PeriodStateChangeListener
- Add getCloneOnUserThread method to PeriodState
- Change addListenerAndGetNotified to addPeriodStateChangeListener
- Call start on PeriodStateMutator from ConsensusServicesSetup instead of own constructor
- Use explicit interface StateChangeEventsProvider for registerStateChangeEventsProvider
- Set setChainHeight at onStartParsingNewBlock at the end to avoid that listeners get called before the cycle is added
- Use PeriodServiceFacade instead of PeriodService in ProposalListService
- Use StateServiceFacade instead of StateService in ProposalListService
- Add market interface StateChangeEventsProvider
This commit is contained in:
Manfred Karrer 2018-04-20 14:02:45 -05:00
parent 8fcab9b1e7
commit 75f84a0fa5
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
7 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/bisq/desktop/main/dao/proposal/BaseProposalView.java
View file

@ -29,12 +29,12 @@ import bisq.desktop.util.BsqFormatter;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.dao.consensus.period.Phase;
import bisq.core.dao.consensus.vote.proposal.Ballot;
import bisq.core.dao.consensus.vote.proposal.MyProposalService;
import bisq.core.dao.consensus.vote.proposal.Proposal;
import bisq.core.dao.consensus.vote.proposal.ProposalListService;
import bisq.core.dao.consensus.vote.proposal.ProposalService;
import bisq.core.dao.consensus.vote.proposal.param.ChangeParamService;
import bisq.core.dao.presentation.period.PeriodServiceFacade;
import bisq.core.dao.presentation.proposal.MyProposalService;
import bisq.core.dao.presentation.proposal.ProposalListService;
import bisq.core.dao.presentation.state.StateServiceFacade;
import bisq.core.locale.Res;

5
src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java
View file

@ -30,9 +30,9 @@ import bisq.core.dao.consensus.state.blockchain.Tx;
import bisq.core.dao.consensus.vote.BooleanVote;
import bisq.core.dao.consensus.vote.Vote;
import bisq.core.dao.consensus.vote.proposal.Ballot;
import bisq.core.dao.consensus.vote.proposal.MyProposalService;
import bisq.core.dao.consensus.vote.proposal.ProposalService;
import bisq.core.dao.presentation.period.PeriodServiceFacade;
import bisq.core.dao.presentation.proposal.MyProposalService;
import bisq.core.dao.presentation.state.StateServiceFacade;
import bisq.core.locale.Res;
@ -135,6 +135,7 @@ public class ProposalListItem implements BlockListener {
stateServiceFacade.getChainHeight());
switch (newValue) {
case UNDEFINED:
log.error("invalid state UNDEFINED");
break;
case PROPOSAL:
if (myProposalService.isMine(ballot.getProposal())) {
@ -182,6 +183,8 @@ public class ProposalListItem implements BlockListener {
break;
case BREAK4:
break;
default:
log.error("invalid state " + newValue);
}
actionButton.setManaged(actionButton.isVisible());

6
src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java
View file

@ -37,12 +37,12 @@ import bisq.core.dao.consensus.period.Phase;
import bisq.core.dao.consensus.vote.BooleanVote;
import bisq.core.dao.consensus.vote.blindvote.BlindVoteConsensus;
import bisq.core.dao.consensus.vote.proposal.Ballot;
import bisq.core.dao.consensus.vote.proposal.MyProposalService;
import bisq.core.dao.consensus.vote.proposal.ProposalListService;
import bisq.core.dao.consensus.vote.proposal.ProposalService;
import bisq.core.dao.consensus.vote.proposal.param.ChangeParamService;
import bisq.core.dao.presentation.myvote.MyVoteService;
import bisq.core.dao.presentation.period.PeriodServiceFacade;
import bisq.core.dao.presentation.proposal.MyProposalService;
import bisq.core.dao.presentation.proposal.ProposalListService;
import bisq.core.dao.presentation.state.StateServiceFacade;
import bisq.core.locale.Res;
@ -322,7 +322,7 @@ public class ActiveProposalsView extends BaseProposalView implements BsqBalanceL
break;
case UNDEFINED:
default:
log.warn("Undefined phase: " + phase);
log.error("Undefined phase: " + phase);
break;
}
}

4
src/main/java/bisq/desktop/main/dao/proposal/closed/ClosedProposalsView.java
View file

@ -23,11 +23,11 @@ import bisq.desktop.util.BSFormatter;
import bisq.desktop.util.BsqFormatter;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.dao.consensus.vote.proposal.MyProposalService;
import bisq.core.dao.consensus.vote.proposal.ProposalListService;
import bisq.core.dao.consensus.vote.proposal.ProposalService;
import bisq.core.dao.consensus.vote.proposal.param.ChangeParamService;
import bisq.core.dao.presentation.period.PeriodServiceFacade;
import bisq.core.dao.presentation.proposal.MyProposalService;
import bisq.core.dao.presentation.proposal.ProposalListService;
import bisq.core.dao.presentation.state.StateServiceFacade;
import javax.inject.Inject;

1
src/main/java/bisq/desktop/main/dao/proposal/dashboard/ProposalDashboardView.java
View file

@ -146,7 +146,6 @@ public class ProposalDashboardView extends ActivatableView<GridPane, Void> imple
int lastBlock = periodServiceFacade.getLastBlockOfPhase(height, item.getPhase());
final int duration = periodServiceFacade.getDurationForPhase(item.getPhase(), periodServiceFacade.getChainHeight());
item.setPeriodRange(firstBlock, lastBlock, duration);
double progress = 0;
if (height >= firstBlock && height <= lastBlock) {
progress = (double) (height - firstBlock + 1) / (double) duration;

2
src/main/java/bisq/desktop/main/dao/proposal/make/MakeProposalView.java
View file

@ -33,12 +33,12 @@ import bisq.core.btc.wallet.InsufficientBsqException;
import bisq.core.btc.wallet.WalletsSetup;
import bisq.core.dao.ValidationException;
import bisq.core.dao.consensus.vote.proposal.Ballot;
import bisq.core.dao.consensus.vote.proposal.MyProposalService;
import bisq.core.dao.consensus.vote.proposal.ProposalConsensus;
import bisq.core.dao.consensus.vote.proposal.ProposalType;
import bisq.core.dao.consensus.vote.proposal.compensation.CompensationService;
import bisq.core.dao.consensus.vote.proposal.generic.GenericProposalService;
import bisq.core.dao.consensus.vote.proposal.param.ChangeParamService;
import bisq.core.dao.presentation.proposal.MyProposalService;
import bisq.core.dao.presentation.state.StateServiceFacade;
import bisq.core.locale.Res;
import bisq.core.provider.fee.FeeService;

4
src/main/java/bisq/desktop/main/dao/proposal/myvotes/MyVotesView.java
View file

@ -33,12 +33,12 @@ import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.dao.consensus.vote.BooleanVote;
import bisq.core.dao.consensus.vote.Vote;
import bisq.core.dao.consensus.vote.proposal.BallotList;
import bisq.core.dao.consensus.vote.proposal.MyProposalService;
import bisq.core.dao.consensus.vote.proposal.ProposalListService;
import bisq.core.dao.consensus.vote.proposal.ProposalService;
import bisq.core.dao.consensus.vote.proposal.param.ChangeParamService;
import bisq.core.dao.presentation.myvote.MyVoteService;
import bisq.core.dao.presentation.period.PeriodServiceFacade;
import bisq.core.dao.presentation.proposal.MyProposalService;
import bisq.core.dao.presentation.proposal.ProposalListService;
import bisq.core.dao.presentation.state.StateServiceFacade;
import bisq.core.locale.Res;
import bisq.core.user.Preferences;