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

Jump to bottom

Persitence of DAO state #1778

Merged
merged 9 commits into from Oct 18, 2018
Merged

Persitence of DAO state #1778

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8e46b17
Add new storage type to p2p library
ManfredKarrer Oct 17, 2018
a308469
Support for persisted bsqState as resource file
ManfredKarrer Oct 17, 2018
e6f44ff
Comment out BsqState in PB definitions
ManfredKarrer Oct 17, 2018
6d18a9e
Rename BsqState to DaoState
ManfredKarrer Oct 17, 2018
0c5df10
Change delay for storage from 2 sec to 200 ms
ManfredKarrer Oct 17, 2018
4d30fcb
Merge branch 'master' into Dao-UI-improvements
ManfredKarrer Oct 17, 2018
15177e6
Add comment
ManfredKarrer Oct 17, 2018
10fcd62
Remove BREAK4
ManfredKarrer Oct 17, 2018
b47678d
Add DAO resync option to preferences
ManfredKarrer Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions core/src/main/java/bisq/core/dao/state/period/DaoPhase.java
View file
Open in desktop
Expand Up @@ -47,8 +47,7 @@ public enum Phase {
BREAK2,
VOTE_REVEAL,
BREAK3,
RESULT,
BREAK4
RESULT
}


Expand Down
2 changes: 0 additions & 2 deletions core/src/main/resources/i18n/displayStrings.properties
View file
Open in desktop
Expand Up @@ -1355,8 +1355,6 @@ dao.phase.VOTE_REVEAL=Vote reveal phase
dao.phase.BREAK3=Break before result phase
# suppress inspection "UnusedProperty"
dao.phase.RESULT=Vote result phase
# suppress inspection "UnusedProperty"
dao.phase.BREAK4=Break before proposal phase

# suppress inspection "UnusedProperty"
dao.phase.separatedPhaseBar.PROPOSAL=Proposal phase
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_fr.properties
View file
Open in desktop
Expand Up @@ -970,7 +970,6 @@ dao.phase.short.BREAK2=Break
dao.phase.short.VOTE_REVEAL=Reveal
dao.phase.short.BREAK3=Break
dao.phase.short.ISSUANCE=Issuance
dao.phase.short.BREAK4=Break

dao.proposal.type.COMPENSATION_REQUEST=Requête de compensation
dao.proposal.type.GENERIC=Generic proposal
Expand Down
3 changes: 1 addition & 2 deletions desktop/src/main/java/bisq/desktop/main/dao/governance/PhasesView.java
View file
Open in desktop
Expand Up @@ -119,8 +119,7 @@ private SeparatedPhaseBars createSeparatedPhaseBars() {
new SeparatedPhaseBars.SeparatedPhaseBarsItem(DaoPhase.Phase.BREAK2, false),
new SeparatedPhaseBars.SeparatedPhaseBarsItem(DaoPhase.Phase.VOTE_REVEAL, true),
new SeparatedPhaseBars.SeparatedPhaseBarsItem(DaoPhase.Phase.BREAK3, false),
new SeparatedPhaseBars.SeparatedPhaseBarsItem(DaoPhase.Phase.RESULT, false),
new SeparatedPhaseBars.SeparatedPhaseBarsItem(DaoPhase.Phase.BREAK4, false));
new SeparatedPhaseBars.SeparatedPhaseBarsItem(DaoPhase.Phase.RESULT, false));
return new SeparatedPhaseBars(phaseBarsItems);
}

Expand Down
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
View file
Open in desktop
Expand Up @@ -447,7 +447,7 @@ public void applyProposalPayload(Proposal proposal) {
checkNotNull(paramComboBox, "paramComboBox must not be null");
paramComboBox.getSelectionModel().select(changeParamProposal.getParam());
checkNotNull(paramValueTextField, "paramValueTextField must not be null");
paramValueTextField.setText(String.valueOf(changeParamProposal.getParamValue()));
paramValueTextField.setText(bsqFormatter.formatParamValue(changeParamProposal.getParam(), changeParamProposal.getParamValue()));
} else if (proposal instanceof BondedRoleProposal) {
BondedRoleProposal bondedRoleProposal = (BondedRoleProposal) proposal;
checkNotNull(bondedRoleTypeComboBox, "bondedRoleComboBox must not be null");
Expand Down