Skip to content

fix(ct): use default hardhat accounts #2426

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

Merged
mergify merged 2 commits into from
Apr 11, 2022
Merged

fix(ct): use default hardhat accounts #2426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e80c46
fix(ct): use default hardhat accounts
smartcontracts Apr 5, 2022
2003ba8
Merge branch 'develop' into sc/ct-robust-hh-fund
mergify[bot] Apr 11, 2022
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
7 changes: 0 additions & 7 deletions packages/contracts/hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ import { HardhatUserConfig } from 'hardhat/types'
import 'solidity-coverage'
import * as dotenv from 'dotenv'

import {
DEFAULT_ACCOUNTS_HARDHAT,
RUN_OVM_TEST_GAS,
} from './test/helpers/constants'

// Hardhat plugins
import '@nomiclabs/hardhat-ethers'
import '@nomiclabs/hardhat-waffle'
Expand All @@ -28,8 +23,6 @@ const deploy = process.env.DEPLOY_DIRECTORY || 'deploy'
const config: HardhatUserConfig = {
networks: {
hardhat: {
accounts: DEFAULT_ACCOUNTS_HARDHAT,
blockGasLimit: RUN_OVM_TEST_GAS * 2,
live: false,
saveDeployments: false,
tags: ['local'],
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/test/contracts/L1/rollup/CanonicalTransactionChain.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ describe('CanonicalTransactionChain', () => {

await expect(
CanonicalTransactionChain.enqueue(target, gasLimit, data, {
gasLimit: 40000000,
gasLimit: 30_000_000,
})
).to.be.revertedWith(
'Transaction data size exceeds maximum for rollup transaction.'
Expand Down
12 changes: 0 additions & 12 deletions packages/contracts/test/helpers/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
/* External Imports */
import { defaultAccounts } from 'ethereum-waffle'

export const DEFAULT_ACCOUNTS_HARDHAT = defaultAccounts.map((account) => {
return {
balance: account.balance,
privateKey: account.secretKey,
}
})

export const RUN_OVM_TEST_GAS = 20_000_000
export const L2_GAS_DISCOUNT_DIVISOR = 32
export const ENQUEUE_GAS_COST = 60_000

export const NON_NULL_BYTES32 =
'0x1111111111111111111111111111111111111111111111111111111111111111'
export const NON_ZERO_ADDRESS = '0x1111111111111111111111111111111111111111'