crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated changelog and ran prettier

Browse Source
This commit is contained in:
Greg Hysen 2019-09-24 10:36:01 -07:00
parent 08c805a489
commit a012eb0cae
2 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/staking/CHANGELOG.json
View File

@ -61,6 +61,14 @@
{ {
"note": "Introduce multi-block finalization.", "note": "Introduce multi-block finalization.",
"pr": 2155 "pr": 2155
},
{
"note": "Removed reference counting for cumulative rewards.",
"pr": 2188
},
{
"note": "Removed explicit dependency on epoch+1 when delegating.",
"pr": 2188
} }
] ]
} }

50
contracts/staking/test/cumulative_reward_tracking_test.ts
View File

@ -68,10 +68,7 @@ blockchainTests.resets('Cumulative Reward Tracking', env => {
// Updates CR for epoch 0 // Updates CR for epoch 0
TestAction.Delegate, TestAction.Delegate,
], ],
[ [{ event: 'SetCumulativeReward', epoch: 0 }, { event: 'SetCumulativeReward', epoch: 0 }],
{ event: 'SetCumulativeReward', epoch: 0 },
{ event: 'SetCumulativeReward', epoch: 0 },
],
); );
}); });
it('delegating in new epoch', async () => { it('delegating in new epoch', async () => {
@ -89,10 +86,7 @@ blockchainTests.resets('Cumulative Reward Tracking', env => {
// Unsets the CR for epoch 0 // Unsets the CR for epoch 0
TestAction.Delegate, TestAction.Delegate,
], ],
[ [{ event: 'SetCumulativeReward', epoch: 1 }, { event: 'SetMostRecentCumulativeReward', epoch: 1 }],
{ event: 'SetCumulativeReward', epoch: 1 },
{ event: 'SetMostRecentCumulativeReward', epoch: 1 },
],
); );
}); });
it('re-delegating in a new epoch', async () => { it('re-delegating in a new epoch', async () => {
@ -111,10 +105,7 @@ blockchainTests.resets('Cumulative Reward Tracking', env => {
// Sets MRCR to epoch 1 // Sets MRCR to epoch 1
TestAction.Delegate, TestAction.Delegate,
], ],
[ [{ event: 'SetCumulativeReward', epoch: 1 }, { event: 'SetMostRecentCumulativeReward', epoch: 1 }],
{ event: 'SetCumulativeReward', epoch: 1 },
{ event: 'SetMostRecentCumulativeReward', epoch: 1 },
],
); );
}); });
it('delegating in epoch 1 then again in epoch 2', async () => { it('delegating in epoch 1 then again in epoch 2', async () => {
@ -137,10 +128,7 @@ blockchainTests.resets('Cumulative Reward Tracking', env => {
// Clears CR for epoch 1 // Clears CR for epoch 1
TestAction.Delegate, TestAction.Delegate,
], ],
[ [{ event: 'SetCumulativeReward', epoch: 2 }, { event: 'SetMostRecentCumulativeReward', epoch: 2 }],
{ event: 'SetCumulativeReward', epoch: 2 },
{ event: 'SetMostRecentCumulativeReward', epoch: 2 },
],
); );
}); });
it('delegate in epoch 1 then undelegate in epoch 2', async () => { it('delegate in epoch 1 then undelegate in epoch 2', async () => {
@ -193,10 +181,7 @@ blockchainTests.resets('Cumulative Reward Tracking', env => {
// Clears CR for epoch 1 // Clears CR for epoch 1
TestAction.Undelegate, TestAction.Undelegate,
], ],
[ [{ event: 'SetCumulativeReward', epoch: 2 }, { event: 'SetMostRecentCumulativeReward', epoch: 2 }],
{ event: 'SetCumulativeReward', epoch: 2 },
{ event: 'SetMostRecentCumulativeReward', epoch: 2 },
],
); );
}); });
it('delegate in epoch 1 and 2 then again in 3', async () => { it('delegate in epoch 1 and 2 then again in 3', async () => {
@ -225,10 +210,7 @@ blockchainTests.resets('Cumulative Reward Tracking', env => {
// Clears CR for epoch 1 // Clears CR for epoch 1
TestAction.Delegate, TestAction.Delegate,
], ],
[ [{ event: 'SetCumulativeReward', epoch: 2 }, { event: 'SetMostRecentCumulativeReward', epoch: 2 }],
{ event: 'SetCumulativeReward', epoch: 2 },
{ event: 'SetMostRecentCumulativeReward', epoch: 2 },
],
); );
}); });
it('delegate in epoch 0, earn reward in epoch 1', async () => { it('delegate in epoch 0, earn reward in epoch 1', async () => {
@ -359,10 +341,7 @@ blockchainTests.resets('Cumulative Reward Tracking', env => {
// Clears CR for epoch 1 // Clears CR for epoch 1
TestAction.Delegate, TestAction.Delegate,
], ],
[ [{ event: 'SetCumulativeReward', epoch: 4 }, { event: 'SetMostRecentCumulativeReward', epoch: 4 }],
{ event: 'SetCumulativeReward', epoch: 4 },
{ event: 'SetMostRecentCumulativeReward', epoch: 4 },
],
); );
}); });
it('earn reward in epoch 1 with no stake, then delegate', async () => { it('earn reward in epoch 1 with no stake, then delegate', async () => {
@ -383,10 +362,7 @@ blockchainTests.resets('Cumulative Reward Tracking', env => {
// Creates CR for epoch 2 // Creates CR for epoch 2
TestAction.Delegate, TestAction.Delegate,
], ],
[ [{ event: 'SetCumulativeReward', epoch: 1 }, { event: 'SetMostRecentCumulativeReward', epoch: 1 }],
{ event: 'SetCumulativeReward', epoch: 1 },
{ event: 'SetMostRecentCumulativeReward', epoch: 1 },
],
); );
}); });
it('delegate in epoch 1, 3, then delegate in epoch 4', async () => { it('delegate in epoch 1, 3, then delegate in epoch 4', async () => {
@ -421,10 +397,7 @@ blockchainTests.resets('Cumulative Reward Tracking', env => {
// Creates CR for epoch 5 // Creates CR for epoch 5
TestAction.Delegate, TestAction.Delegate,
], ],
[ [{ event: 'SetCumulativeReward', epoch: 4 }, { event: 'SetMostRecentCumulativeReward', epoch: 4 }],
{ event: 'SetCumulativeReward', epoch: 4 },
{ event: 'SetMostRecentCumulativeReward', epoch: 4 },
],
); );
}); });
it('delegate in epoch 1, then epoch 3', async () => { it('delegate in epoch 1, then epoch 3', async () => {
@ -452,10 +425,7 @@ blockchainTests.resets('Cumulative Reward Tracking', env => {
// Clears CR for epoch 2 // Clears CR for epoch 2
TestAction.Delegate, TestAction.Delegate,
], ],
[ [{ event: 'SetCumulativeReward', epoch: 3 }, { event: 'SetMostRecentCumulativeReward', epoch: 3 }],
{ event: 'SetCumulativeReward', epoch: 3 },
{ event: 'SetMostRecentCumulativeReward', epoch: 3 },
],
); );
}); });
}); });