Commit 7a7fbe45 authored by Dipto Chakrabarty's avatar Dipto Chakrabarty Committed by GitHub

update fakecontract creation using smock (#2342)

* update fakecontract creation using smock

* fix lint errors

* fix linters issues
Co-authored-by: default avatarMaurelian <maurelian@protonmail.ch>
Co-authored-by: default avatarmergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
parent ed057f61
...@@ -69,17 +69,15 @@ describe('L1CrossDomainMessenger', () => { ...@@ -69,17 +69,15 @@ describe('L1CrossDomainMessenger', () => {
let CanonicalTransactionChain: Contract let CanonicalTransactionChain: Contract
before(async () => { before(async () => {
Fake__TargetContract = await smock.fake<Contract>( Fake__TargetContract = await smock.fake<Contract>('Helper_SimpleProxy')
await ethers.getContractFactory('Helper_SimpleProxy')
)
Fake__L2CrossDomainMessenger = await smock.fake<Contract>( Fake__L2CrossDomainMessenger = await smock.fake<Contract>(
await ethers.getContractFactory('L2CrossDomainMessenger'), 'L2CrossDomainMessenger',
{ {
address: predeploys.L2CrossDomainMessenger, address: predeploys.L2CrossDomainMessenger,
} }
) )
Fake__StateCommitmentChain = await smock.fake<Contract>( Fake__StateCommitmentChain = await smock.fake<Contract>(
await ethers.getContractFactory('StateCommitmentChain') 'StateCommitmentChain'
) )
await AddressManager.setAddress( await AddressManager.setAddress(
......
...@@ -40,7 +40,7 @@ describe('L1StandardBridge', () => { ...@@ -40,7 +40,7 @@ describe('L1StandardBridge', () => {
before(async () => { before(async () => {
;[l1MessengerImpersonator, alice, bob] = await ethers.getSigners() ;[l1MessengerImpersonator, alice, bob] = await ethers.getSigners()
await smock.fake<Contract>(await ethers.getContractFactory('OVM_ETH')) await smock.fake<Contract>('OVM_ETH')
// deploy an ERC20 contract on L1 // deploy an ERC20 contract on L1
Factory__L1ERC20 = await smock.mock( Factory__L1ERC20 = await smock.mock(
...@@ -60,7 +60,7 @@ describe('L1StandardBridge', () => { ...@@ -60,7 +60,7 @@ describe('L1StandardBridge', () => {
beforeEach(async () => { beforeEach(async () => {
// Get a new mock L1 messenger // Get a new mock L1 messenger
Fake__L1CrossDomainMessenger = await smock.fake<Contract>( Fake__L1CrossDomainMessenger = await smock.fake<Contract>(
await ethers.getContractFactory('L1CrossDomainMessenger'), 'L1CrossDomainMessenger',
{ address: await l1MessengerImpersonator.getAddress() } // This allows us to use an ethers override {from: Mock__L2CrossDomainMessenger.address} to mock calls { address: await l1MessengerImpersonator.getAddress() } // This allows us to use an ethers override {from: Mock__L2CrossDomainMessenger.address} to mock calls
) )
......
...@@ -55,7 +55,7 @@ describe('[GAS BENCHMARK] CanonicalTransactionChain [ @skip-on-coverage ]', () = ...@@ -55,7 +55,7 @@ describe('[GAS BENCHMARK] CanonicalTransactionChain [ @skip-on-coverage ]', () =
) )
Fake__StateCommitmentChain = await smock.fake<Contract>( Fake__StateCommitmentChain = await smock.fake<Contract>(
await ethers.getContractFactory('StateCommitmentChain') 'StateCommitmentChain'
) )
await setProxyTarget( await setProxyTarget(
......
...@@ -78,7 +78,7 @@ describe('CanonicalTransactionChain', () => { ...@@ -78,7 +78,7 @@ describe('CanonicalTransactionChain', () => {
) )
Fake__StateCommitmentChain = await smock.fake<Contract>( Fake__StateCommitmentChain = await smock.fake<Contract>(
await ethers.getContractFactory('StateCommitmentChain') 'StateCommitmentChain'
) )
await setProxyTarget( await setProxyTarget(
......
...@@ -29,7 +29,7 @@ describe('StateCommitmentChain', () => { ...@@ -29,7 +29,7 @@ describe('StateCommitmentChain', () => {
let Fake__BondManager: FakeContract let Fake__BondManager: FakeContract
before(async () => { before(async () => {
Fake__CanonicalTransactionChain = await smock.fake<Contract>( Fake__CanonicalTransactionChain = await smock.fake<Contract>(
await ethers.getContractFactory('CanonicalTransactionChain') 'CanonicalTransactionChain'
) )
await setProxyTarget( await setProxyTarget(
...@@ -38,9 +38,7 @@ describe('StateCommitmentChain', () => { ...@@ -38,9 +38,7 @@ describe('StateCommitmentChain', () => {
Fake__CanonicalTransactionChain Fake__CanonicalTransactionChain
) )
Fake__BondManager = await smock.fake<Contract>( Fake__BondManager = await smock.fake<Contract>('BondManager')
await ethers.getContractFactory('BondManager')
)
await setProxyTarget(AddressManager, 'BondManager', Fake__BondManager) await setProxyTarget(AddressManager, 'BondManager', Fake__BondManager)
......
...@@ -27,14 +27,12 @@ describe('L2CrossDomainMessenger', () => { ...@@ -27,14 +27,12 @@ describe('L2CrossDomainMessenger', () => {
let Fake__L1CrossDomainMessenger: FakeContract let Fake__L1CrossDomainMessenger: FakeContract
let Fake__OVM_L2ToL1MessagePasser: FakeContract let Fake__OVM_L2ToL1MessagePasser: FakeContract
before(async () => { before(async () => {
Fake__TargetContract = await smock.fake<Contract>( Fake__TargetContract = await smock.fake<Contract>('Helper_SimpleProxy')
await ethers.getContractFactory('Helper_SimpleProxy')
)
Fake__L1CrossDomainMessenger = await smock.fake<Contract>( Fake__L1CrossDomainMessenger = await smock.fake<Contract>(
await ethers.getContractFactory('L1CrossDomainMessenger') 'L1CrossDomainMessenger'
) )
Fake__OVM_L2ToL1MessagePasser = await smock.fake<Contract>( Fake__OVM_L2ToL1MessagePasser = await smock.fake<Contract>(
await ethers.getContractFactory('OVM_L2ToL1MessagePasser'), 'OVM_L2ToL1MessagePasser',
{ address: predeploys.OVM_L2ToL1MessagePasser } { address: predeploys.OVM_L2ToL1MessagePasser }
) )
}) })
......
...@@ -45,7 +45,7 @@ describe('L2StandardBridge', () => { ...@@ -45,7 +45,7 @@ describe('L2StandardBridge', () => {
beforeEach(async () => { beforeEach(async () => {
// Get a new mock L2 messenger // Get a new mock L2 messenger
Fake__L2CrossDomainMessenger = await smock.fake<Contract>( Fake__L2CrossDomainMessenger = await smock.fake<Contract>(
await ethers.getContractFactory('L2CrossDomainMessenger'), 'L2CrossDomainMessenger',
// This allows us to use an ethers override {from: Mock__L2CrossDomainMessenger.address} to mock calls // This allows us to use an ethers override {from: Mock__L2CrossDomainMessenger.address} to mock calls
{ address: await l2MessengerImpersonator.getAddress() } { address: await l2MessengerImpersonator.getAddress() }
) )
......
...@@ -28,7 +28,7 @@ describe.skip('OVM_L2ToL1MessagePasser', () => { ...@@ -28,7 +28,7 @@ describe.skip('OVM_L2ToL1MessagePasser', () => {
let Fake__OVM_ExecutionManager: FakeContract let Fake__OVM_ExecutionManager: FakeContract
before(async () => { before(async () => {
Fake__OVM_ExecutionManager = await smock.fake<Contract>( Fake__OVM_ExecutionManager = await smock.fake<Contract>(
await ethers.getContractFactory('OVM_ExecutionManager') 'OVM_ExecutionManager'
) )
}) })
......
...@@ -39,9 +39,7 @@ describe('Lib_MerkleTree', () => { ...@@ -39,9 +39,7 @@ describe('Lib_MerkleTree', () => {
await ethers.getContractFactory('TestLib_MerkleTree') await ethers.getContractFactory('TestLib_MerkleTree')
).deploy() ).deploy()
Fake__LibMerkleTree = await smock.fake( Fake__LibMerkleTree = await smock.fake('TestLib_MerkleTree')
await ethers.getContractFactory('TestLib_MerkleTree')
)
}) })
describe('getMerkleRoot', () => { describe('getMerkleRoot', () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment