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

Dao fix issues with majority hash #2360

Merged
merged 7 commits into from Feb 3, 2019

Conversation

Projects
None yet
2 participants
@ManfredKarrer
Copy link
Member

ManfredKarrer commented Feb 3, 2019

No description provided.

ManfredKarrer added some commits Feb 3, 2019

@ManfredKarrer ManfredKarrer requested review from ripcurlx and sqrrm Feb 3, 2019

@sqrrm

sqrrm approved these changes Feb 3, 2019

Copy link
Member

sqrrm left a comment

utACK

Added some fixes to spelling mistakes and variable naming.

Otherwise this looks better, waiting for the end of batch parsing and checking the current phase at that height before publishing vote. I wonder if our usage of chainHeight, blocHeight, height and what not is lacking since we're getting confused. Perhaps better naming would help us understand better what we're doing.

sqrrm and others added some commits Feb 3, 2019

Update core/src/main/java/bisq/core/dao/node/BsqNode.java
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
Update core/src/main/java/bisq/core/dao/governance/votereveal/VoteRev…
…ealService.java

Co-Authored-By: ManfredKarrer <mk@nucleo.io>
Update core/src/main/java/bisq/core/dao/governance/votereveal/VoteRev…
…ealService.java

Co-Authored-By: ManfredKarrer <mk@nucleo.io>
Update core/src/main/java/bisq/core/dao/governance/votereveal/VoteRev…
…ealService.java

Co-Authored-By: ManfredKarrer <mk@nucleo.io>
@ManfredKarrer

This comment has been minimized.

Copy link
Member Author

ManfredKarrer commented Feb 3, 2019

Yes we should rename once blockHeight params to be always the same.

@sqrrm

This comment has been minimized.

Copy link
Member

sqrrm commented Feb 3, 2019

Yes we should rename once blockHeight params to be always the same.

I think we might need to differentiate between parsed height, known last block height, height for a certain block and perhaps even more and use different but consistent names.

@ManfredKarrer ManfredKarrer merged commit 2615464 into bisq-network:master Feb 3, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ManfredKarrer ManfredKarrer deleted the ManfredKarrer:dao-fix-issues-with-majority-hash branch Feb 3, 2019

@sqrrm sqrrm referenced this pull request Feb 28, 2019

Closed

For February 2019 #228

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.