NoBey/uniswap-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block.number -> block.timestamp

Browse Source 
tweak timing tests

make tests even better
This commit is contained in:
Noah Zinsmeister
2020-01-23 12:04:36 -05:00
parent 5ea4c937f4
commit a55aa4bfed
4 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/UniswapV2Exchange.spec.ts
View File

@ -3,7 +3,7 @@ import { Contract } from 'ethers'
import { solidity, MockProvider, createFixtureLoader } from 'ethereum-waffle'
import { BigNumber, bigNumberify } from 'ethers/utils'
import { expandTo18Decimals, mineBlocks } from './shared/utilities'
import { expandTo18Decimals, mineBlock } from './shared/utilities'
import { exchangeFixture } from './shared/fixtures'
import { AddressZero } from 'ethers/constants'
@ -142,11 +142,13 @@ describe('UniswapV2Exchange', () => {
await addLiquidity(token0Amount, token1Amount)
// ensure that setting price{0,1}CumulativeLast for the first time doesn't affect our gas math
await mineBlock(provider, 1)
await exchange.sync(overrides)
const swapAmount = expandTo18Decimals(1)
const expectedOutputAmount = bigNumberify('453305446940074565')
await token0.transfer(exchange.address, swapAmount)
await mineBlock(provider, 1)
const gasCost = await exchange.estimate.swap(token0.address, expectedOutputAmount, wallet.address, overrides)
console.log(`Gas required for swap: ${gasCost}`)
})
@ -182,16 +184,17 @@ describe('UniswapV2Exchange', () => {
const token1Amount = expandTo18Decimals(3)
await addLiquidity(token0Amount, token1Amount)
const blockNumber = (await exchange.getReserves())[2]
const blockTimestamp = (await exchange.getReserves())[2]
expect(await exchange.price0CumulativeLast()).to.eq(0)
expect(await exchange.price1CumulativeLast()).to.eq(0)
await mineBlock(provider, 1)
await exchange.sync(overrides)
expect(await exchange.price0CumulativeLast()).to.eq(bigNumberify(2).pow(112))
expect(await exchange.price1CumulativeLast()).to.eq(bigNumberify(2).pow(112))
expect((await exchange.getReserves())[2]).to.eq(blockNumber + 1)
expect((await exchange.getReserves())[2]).to.eq(blockTimestamp + 1)
await mineBlocks(provider, 8)
await mineBlock(provider, 9)
await exchange.sync(overrides)
expect(await exchange.price0CumulativeLast()).to.eq(
bigNumberify(2)
@ -203,6 +206,6 @@ describe('UniswapV2Exchange', () => {
.pow(112)
.mul(10)
)
expect((await exchange.getReserves())[2]).to.eq(blockNumber + 10)
expect((await exchange.getReserves())[2]).to.eq(blockTimestamp + 10)
})
})

11
test/shared/utilities.ts
View File

@ -79,10 +79,10 @@ export async function getApprovalDigest(
)
}
async function mineBlock(provider: Web3Provider, timestamp?: number): Promise<void> {
await new Promise((resolve, reject) => {
export async function mineBlock(provider: Web3Provider, seconds: number): Promise<void> {
await new Promise(async (resolve, reject) => {
;(provider._web3Provider.sendAsync as any)(
{ jsonrpc: '2.0', method: 'evm_mine', params: timestamp ? [timestamp] : [] },
{ jsonrpc: '2.0', method: 'evm_mine', params: [(await provider.getBlock('latest')).timestamp + seconds] },
(error: any, result: any): void => {
if (error) {
reject(error)
@ -93,8 +93,3 @@ async function mineBlock(provider: Web3Provider, timestamp?: number): Promise<vo
)
})
}
export async function mineBlocks(provider: Web3Provider, numberOfBlocks: number, timestamp?: number): Promise<void> {
await Promise.all([...Array(numberOfBlocks - 1)].map(() => mineBlock(provider)))
await mineBlock(provider, timestamp)
}