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

static tests, my nemesis

Browse Source
This commit is contained in:
Michael Zhu
2019-11-06 19:36:35 -08:00
parent f33a9d162a
commit 1f5a0987cb
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/integrations/test/internal-integration-tests/fillorder_test.ts
View File

@@ -284,9 +284,7 @@ blockchainTests.resets('fillOrder integration tests', env => {
);
// The rewards are split between the operator and delegator based on the pool's operatorShare
const operatorReward = rewardsAvailable
.times(operatorShare)
.dividedToIntegerBy(constants.PPM_DENOMINATOR);
const operatorReward = rewardsAvailable.times(operatorShare).dividedToIntegerBy(constants.PPM_DENOMINATOR);
const delegatorReward = rewardsAvailable.minus(operatorReward);
// Finalize the pool. This should automatically pay the operator in WETH.
@@ -365,9 +363,7 @@ blockchainTests.resets('fillOrder integration tests', env => {
balanceStore.assertEquals(expectedBalances);
// The rewards are split between the operator and delegator based on the pool's operatorShare
const operatorReward = rewardsAvailable
.times(operatorShare)
.dividedToIntegerBy(constants.PPM_DENOMINATOR);
const operatorReward = rewardsAvailable.times(operatorShare).dividedToIntegerBy(constants.PPM_DENOMINATOR);
// Finalize the pool. This should automatically pay the operator in WETH.
const [finalizePoolReceipt] = await delegator.finalizePoolsAsync([poolId]);

2
contracts/staking/src/types.ts
View File

@@ -4,6 +4,8 @@ import { DecodedLogArgs, LogWithDecodedArgs } from 'ethereum-types';
import { constants as stakingConstants } from './constants';
// tslint:disable:max-classes-per-file
export interface StakingParams {
epochDurationInSeconds: Numberish;
rewardDelegatedStakeWeight: Numberish;