Test/ Refactor of swap operator tests #486
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
paterson1
force-pushed
the
test/swapOperator-tests-refactor
branch
from
54b532b to
9ee07fc
Compare
danoctavian
reviewed
Nov 11, 2022
| // Executing as non-controller should succeed | ||
| await setNextBlockTime(deadline + 1); | ||
| await swapOperator.connect(governance).closeOrder(contractOrder); | ||
| // Executing as non-controller should succeed |
There was a problem hiding this comment.
let's make this address some random address not governance so the test is accurate
danoctavian
reviewed
Nov 11, 2022
test/unit/SwapOperator/closeOrder.js
Outdated
| .to.emit(swapOperator, 'OrderClosed') | ||
| .withArgs(makeOrderTuple(contractOrder), order.sellAmount.div(2)); | ||
| }); | ||
| it('emitting OrderClosed event when order was partially filled', async function () { |
There was a problem hiding this comment.
emits OrderClosed event when order was partially filled
danoctavian
reviewed
Nov 11, 2022
test/unit/SwapOperator/closeOrder.js
Outdated
|
|
||
| it('when order was fully filled', async function () { | ||
| await cowSettlement.fill(contractOrder, orderUID, order.sellAmount, order.feeAmount, order.buyAmount); | ||
| it('emitting OrderClosed event when order was fully filled', async function () { |
There was a problem hiding this comment.
emits OrderClosed event when order was fully filled
danoctavian
reviewed
Nov 11, 2022
test/unit/SwapOperator/closeOrder.js
Outdated
| expect(await weth.allowance(swapOperator.address, cowVaultRelayer.address)).to.eq( | ||
| order.sellAmount.add(order.feeAmount), | ||
| ); | ||
| it('canceling the presignature and allowance: does so if the order was not filled at all', async function () { |
There was a problem hiding this comment.
'presignature is false and allowance is 0 when order was not filled at all'
danoctavian
reviewed
Nov 11, 2022
test/unit/SwapOperator/closeOrder.js
Outdated
| order.feeAmount.div(2), | ||
| order.buyAmount.div(2), | ||
| ); | ||
| it('canceling the presignature and allowance: does so if the order is partially filled', async function () { |
There was a problem hiding this comment.
'cancels presignature and allowance when the order is partially filled'
danoctavian
reviewed
Nov 11, 2022
test/unit/SwapOperator/closeOrder.js
Outdated
| ); | ||
| expect(await dai.balanceOf(swapOperator.address)).to.eq(0); | ||
| expect(await weth.balanceOf(swapOperator.address)).to.gt(0); | ||
| it('canceling the presignature and allowance: does so if the order was fully filled', async function () { |
There was a problem hiding this comment.
'cancels presignature and allowance when the order is fully filled'
danoctavian
reviewed
Nov 11, 2022
test/unit/SwapOperator/closeOrder.js
Outdated
| it('withdraws and unwraps ether if buyToken is weth', async function () { | ||
| // Cancel current order | ||
| await swapOperator.closeOrder(contractOrder); | ||
| it('withdrawing buyToken to pool withdraws and unwraps ether if buyToken is weth', async function () { |
There was a problem hiding this comment.
withdraws buyToken to pool and unwraps ether if buyToken is weth
danoctavian
reviewed
Nov 11, 2022
test/unit/SwapOperator/closeOrder.js
Outdated
| it('transfer the erc20 token if its not weth', async function () { | ||
| expect(await dai.balanceOf(swapOperator.address)).to.eq(0); | ||
| expect(await dai.balanceOf(pool.address)).to.eq(0); | ||
| it('withdrawing buyToken to pool transfer the erc20 token if its not weth', async function () { |
There was a problem hiding this comment.
withdraws buyToken to pool when buyToken is an erc20 token
danoctavian
reviewed
Nov 11, 2022
test/unit/SwapOperator/closeOrder.js
Outdated
| it('withdraws and unwraps ether if sellToken is weth', async function () { | ||
| const initialPoolEth = await ethers.provider.getBalance(pool.address); | ||
| const initialOperatorWeth = await weth.balanceOf(swapOperator.address); | ||
| it('returning sellToken to pool withdraws and unwraps ether if sellToken is weth', async function () { |
There was a problem hiding this comment.
returns sellToken to pool and unwraps ether if sellToken is weth
danoctavian
reviewed
Nov 11, 2022
test/unit/SwapOperator/closeOrder.js
Outdated
| it('transfers the erc20 token to pool if its not weth', async function () { | ||
| // Cancel current order | ||
| await swapOperator.closeOrder(contractOrder); | ||
| it('returning sellToken to pool transfers the erc20 token to pool if its not weth', async function () { |
There was a problem hiding this comment.
returns sellToken to pool when sellToken is an erc20 token
danoctavian
reviewed
Nov 11, 2022
test/unit/SwapOperator/closeOrder.js
Outdated
| .to.emit(swapOperator, 'OrderClosed') | ||
| .withArgs(makeOrderTuple(contractOrder), 0); | ||
| }); | ||
| it('when order was not filled', async function () { |
There was a problem hiding this comment.
emits OrderClosed event when order was not filled
danoctavian
reviewed
Nov 11, 2022
test/unit/SwapOperator/placeOrder.js
Outdated
| it('performs the validation when buyToken is not WETH', async function () { | ||
| // Since DAI was already registered on setup, set its details to 0 | ||
| await pool.connect(governance).setSwapDetails(dai.address, 0, 0, 0, true); // otherSigner is governant | ||
| it('performs the validation assets details when buyToken is not WETH', async function () { |
There was a problem hiding this comment.
validates asset details when buyToken is not WETH
danoctavian
reviewed
Nov 11, 2022
test/unit/SwapOperator/placeOrder.js
Outdated
| lastSwapTime = (await pool.getAssetSwapDetails(dai.address)).lastSwapTime; | ||
| expect(lastSwapTime).to.eq(await lastBlockTimestamp()); | ||
| }); | ||
| it('setting lastSwapDate: sets it on buyAsset when selling ETH', async function () { |
There was a problem hiding this comment.
sets lastSwapDate on buyAsset when selling ETH
danoctavian
reviewed
Nov 11, 2022
test/unit/SwapOperator/placeOrder.js
Outdated
| describe('setting pools swapValue', function () { | ||
| it('works when selling eth', async function () { | ||
| expect(await pool.swapValue()).to.eq(0); | ||
| it('setting lastSwapDate: sets it on sellAsset when buying ETH', async function () { |
There was a problem hiding this comment.
sets lastSwapDate on sellAsset when buying ETH
danoctavian
suggested changes
Nov 11, 2022
roxdanila
force-pushed
the
test/swapOperator-tests-refactor
branch
from
3772821 to
f7a00c6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Context
Closes #390
Changes proposed in this pull request
Refactored out some common constants between
placeOrderandcloseOrder. Also tried to flatten the nesting ofdescribeblocks without losing too much context for each unit test.Checklist
Review
When reviewing a PR, please indicate intention in comments using the following emojis: