Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for deploying the contracts and build artifacts to npmjs #62

Merged
merged 6 commits into from
Apr 15, 2020
Merged

Prepare for deploying the contracts and build artifacts to npmjs #62

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6cf43db
Prepare for deploying the contracts and build artifacts to npmjs
moodysalem Apr 15, 2020
6fa21c2
Remove overrides from fixtures.ts
moodysalem Apr 15, 2020
d60d466
Change the test to verify the actual gas used instead of the buggy es…
moodysalem Apr 15, 2020
840527f
Uncomment a test that was fixed with latest waffle
moodysalem Apr 15, 2020
bcf5d74
Add back overrides to see if it fixes CI
moodysalem Apr 15, 2020
1d583b6
prepare -> prepublishOnly
moodysalem Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove overrides from fixtures.ts
  • Loading branch information
@moodysalem
moodysalem committed Apr 15, 2020
commit 6fa21c246d66d309d0ae8ab6cf1597c130f7c97d
12 changes: 4 additions & 8 deletions test/shared/fixtures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@ interface FactoryFixture {
factory: Contract
}

const overrides = {
gasLimit: 9999999
}

export async function factoryFixture(_: Web3Provider, [wallet]: Wallet[]): Promise<FactoryFixture> {
const factory = await deployContract(wallet, UniswapV2Factory, [wallet.address], overrides)
const factory = await deployContract(wallet, UniswapV2Factory, [wallet.address])
return { factory }
}

Expand All @@ -30,10 +26,10 @@ interface PairFixture extends FactoryFixture {
export async function pairFixture(provider: Web3Provider, [wallet]: Wallet[]): Promise<PairFixture> {
const { factory } = await factoryFixture(provider, [wallet])

const tokenA = await deployContract(wallet, ERC20, [expandTo18Decimals(10000)], overrides)
const tokenB = await deployContract(wallet, ERC20, [expandTo18Decimals(10000)], overrides)
const tokenA = await deployContract(wallet, ERC20, [expandTo18Decimals(10000)])
const tokenB = await deployContract(wallet, ERC20, [expandTo18Decimals(10000)])

await factory.createPair(tokenA.address, tokenB.address, overrides)
await factory.createPair(tokenA.address, tokenB.address)
const pairAddress = await factory.getPair(tokenA.address, tokenB.address)
const pair = new Contract(pairAddress, JSON.stringify(UniswapV2Pair.abi), provider).connect(wallet)

Expand Down