Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions contracts/votingMachines/GenesisProtocolLogic.sol
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,7 @@ contract GenesisProtocolLogic is IntVoteInterface {
if (proposal.state != ProposalState.QuietEndingPeriod) {
proposal.currentBoostedVotePeriodLimit = params.quietEndingPeriod;
proposal.state = ProposalState.QuietEndingPeriod;
emit StateChange(_proposalId, proposal.state);
}
// solhint-disable-next-line not-rely-on-time
proposal.times[1] = now;
Expand Down
6 changes: 5 additions & 1 deletion test/genesisprotocol.js
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,11 @@ contract('GenesisProtocol', accounts => {
await helpers.increaseTime(50); //get into the quite period
assert.equal(await threshold(testSetup),2);

await testSetup.genesisProtocol.vote(proposalId,NO,0,helpers.NULL_ADDRESS,{from:accounts[0]}); //change winning vote
var tx = await testSetup.genesisProtocol.vote(proposalId,NO,0,helpers.NULL_ADDRESS,{from:accounts[0]}); //change winning vote

assert.equal(tx.logs[0].event, "StateChange");
assert.equal(tx.logs[0].args._proposalState, 6);

assert.equal(await threshold(testSetup),2);

proposalInfo = await testSetup.genesisProtocol.proposals(proposalId);
Expand Down