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

@0x/contracts-staking: Rebase against 3.0 AGAIN AGAIN AGAIN AGAIN AGAIN

Browse Source
This commit is contained in:
Lawrence Forman
2019-09-10 00:45:20 -04:00
parent 3b28c9d5a7
commit f45ee486e9
4 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
contracts/staking/contracts/src/libs/LibStakingRichErrors.sol
View File

@@ -23,6 +23,11 @@ import "@0x/contracts-utils/contracts/src/LibRichErrors.sol";
library LibStakingRichErrors {
enum OperatorShareErrorCodes {
OperatorShareTooLarge,
CanOnlyDecreaseOperatorShare
}
enum ProtocolFeePaymentErrorCodes {
ZeroProtocolFeePaid,
MismatchedFeeAndPayment
@@ -142,18 +147,6 @@ library LibStakingRichErrors {
bytes internal constant INVALID_WETH_ASSET_DATA_ERROR =
hex"24bf322c";
enum MakerPoolAssignmentErrorCodes {
MAKER_ADDRESS_ALREADY_REGISTERED,
MAKER_ADDRESS_NOT_REGISTERED,
MAKER_ADDRESS_NOT_PENDING_ADD,
POOL_IS_FULL
}
enum OperatorShareErrorCodes {
OPERATOR_SHARE_MUST_BE_BETWEEN_0_AND_100,
CAN_ONLY_DECREASE_OPERATOR_SHARE
}
// solhint-disable func-name-mixedcase
function MiscalculatedRewardsError(
uint256 totalRewardsPaid,

4
contracts/staking/contracts/src/vaults/StakingPoolRewardVault.sol
View File

@@ -187,7 +187,7 @@ contract StakingPoolRewardVault is
// operator share must be a valid fraction
if (operatorShare > PPM_DENOMINATOR) {
LibRichErrors.rrevert(LibStakingRichErrors.OperatorShareError(
LibStakingRichErrors.OperatorShareErrorCodes.OPERATOR_SHARE_MUST_BE_BETWEEN_0_AND_100,
LibStakingRichErrors.OperatorShareErrorCodes.OperatorShareTooLarge,
poolId,
operatorShare
));
@@ -224,7 +224,7 @@ contract StakingPoolRewardVault is
if (newOperatorShare >= oldOperatorShare) {
LibRichErrors.rrevert(LibStakingRichErrors.OperatorShareError(
LibStakingRichErrors.OperatorShareErrorCodes.CAN_ONLY_DECREASE_OPERATOR_SHARE,
LibStakingRichErrors.OperatorShareErrorCodes.CanOnlyDecreaseOperatorShare,
poolId,
newOperatorShare
));

4
contracts/staking/test/migration.ts
View File

@@ -105,13 +105,13 @@ blockchainTests('Migration tests', env => {
await assertInitStateAsync(proxyContract);
});
it('emits a `StakingContractAttached` event', async () => {
it('emits a `StakingContractAttachedToProxy` event', async () => {
const receipt = await proxyContract.attachStakingContract.awaitTransactionSuccessAsync(
initTargetContract.address,
);
const logsArgs = filterLogsToArguments<TestStakingProxyStakingContractAttachedToProxyEventArgs>(
receipt.logs,
'StakingContractAttached',
'StakingContractAttachedToProxy',
);
expect(logsArgs.length).to.eq(1);
for (const args of logsArgs) {

4
contracts/staking/test/pools_test.ts
View File

@@ -50,7 +50,7 @@ blockchainTests('Staking Pool Management', env => {
const poolOperator = new PoolOperatorActor(operatorAddress, stakingApiWrapper);
const revertError = new StakingRevertErrors.OperatorShareError(
StakingRevertErrors.OperatorShareErrorCodes.OperatorShareMustBeBetween0And100,
StakingRevertErrors.OperatorShareErrorCodes.OperatorShareTooLarge,
stakingConstants.INITIAL_POOL_ID,
operatorShare,
);
@@ -79,7 +79,7 @@ blockchainTests('Staking Pool Management', env => {
const tx = poolOperator.createStakingPoolAsync(operatorShare, true);
const expectedPoolId = stakingConstants.INITIAL_POOL_ID;
const expectedError = new StakingRevertErrors.OperatorShareError(
StakingRevertErrors.OperatorShareErrorCodes.OperatorShareMustBeBetween0And100,
StakingRevertErrors.OperatorShareErrorCodes.OperatorShareTooLarge,
expectedPoolId,
operatorShare,
);