Skip to content

V0.12.1.x governance pr 2#950

Merged
schinzelh merged 4 commits into
dashpay:v0.12.1.xfrom
tgflynn:v0.12.1.x-governance-PR-2
Aug 19, 2016
Merged

V0.12.1.x governance pr 2#950
schinzelh merged 4 commits into
dashpay:v0.12.1.xfrom
tgflynn:v0.12.1.x-governance-PR-2

Conversation

@tgflynn

@tgflynn tgflynn commented Aug 19, 2016

Copy link
Copy Markdown

This fixes the forking issue on testnet and restores miner rewards for superblocks. The RPC tests have also been fixed so that tests do not run until masternode syncing is complete. Only the tests which failed with the governance fix have had the syncing change applied because it does increase the time needed for the tests by a bit.

Note: I'm including both the governance fixes and RPC test fixes in one PR so as not to create an order dependence between 2 PR's, especially since there is already a backlog of unmerged PR's at the moment.

  - This restores behavior very close to that in 12.0
  - Needed to prevent the forking problem currently being seen on
    testnet between online and offline nodes
  - This is expected to be a temporary fix while we develop a
    long-term solution for this problem
  - This is needed to allow fixing RPC tests so that they wait until
    the nodes are fully synced before performing tests
@UdjinM6

UdjinM6 commented Aug 19, 2016

Copy link
Copy Markdown

I'm not sure if that is enough but definitely looks like a good step forward.
utACK a9ddf6f

@schinzelh

Copy link
Copy Markdown

utACK a9ddf6f

@schinzelh
schinzelh merged commit 123aa04 into dashpay:v0.12.1.x Aug 19, 2016
@tgflynn
tgflynn deleted the v0.12.1.x-governance-PR-2 branch September 7, 2016 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants