Skip to content

cleanup: Remove setProxyTarget function #2516

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
May 1, 2022
Merged

cleanup: Remove setProxyTarget function #2516

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
79877d2
cleanup: Remove setProxyTarget function
lucadonnoh Apr 30, 2022
ae7cbe0
Merge branch 'develop' into develop
mergify[bot] May 1, 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
6 changes: 2 additions & 4 deletions packages/contracts/test/contracts/L1/messaging/L1CrossDomainMessenger.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'

import { expect } from '../../../setup'
import {
setProxyTarget,
NON_NULL_BYTES32,
NON_ZERO_ADDRESS,
DUMMY_BATCH_HEADERS,
Expand Down Expand Up @@ -57,10 +56,9 @@ describe('L1CrossDomainMessenger', () => {
Fake__L2CrossDomainMessenger.address
)

await setProxyTarget(
AddressManager,
await AddressManager.setAddress(
'StateCommitmentChain',
Fake__StateCommitmentChain
Fake__StateCommitmentChain.address
)

CanonicalTransactionChain = await deploy('CanonicalTransactionChain', {
Expand Down
6 changes: 2 additions & 4 deletions packages/contracts/test/contracts/L1/rollup/CanonicalTransactionChain.gas.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { TransactionResponse } from '@ethersproject/abstract-provider'
/* Internal Imports */
import {
deploy,
setProxyTarget,
L2_GAS_DISCOUNT_DIVISOR,
ENQUEUE_GAS_COST,
getEthTime,
Expand Down Expand Up @@ -59,10 +58,9 @@ describe('[GAS BENCHMARK] CanonicalTransactionChain [ @skip-on-coverage ]', () =
'StateCommitmentChain'
)

await setProxyTarget(
AddressManager,
await AddressManager.setAddress(
'StateCommitmentChain',
Fake__StateCommitmentChain
Fake__StateCommitmentChain.address
)

CanonicalTransactionChain = await deploy('CanonicalTransactionChain', {
Expand Down
6 changes: 2 additions & 4 deletions 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 @@ -12,7 +12,6 @@ import _ from 'lodash'
import { expect } from '../../../setup'
import {
deploy,
setProxyTarget,
L2_GAS_DISCOUNT_DIVISOR,
ENQUEUE_GAS_COST,
setEthTime,
Expand Down Expand Up @@ -67,10 +66,9 @@ describe('CanonicalTransactionChain', () => {
'StateCommitmentChain'
)

await setProxyTarget(
AddressManager,
await AddressManager.setAddress(
'StateCommitmentChain',
Fake__StateCommitmentChain
Fake__StateCommitmentChain.address
)

CanonicalTransactionChain = await deploy('CanonicalTransactionChain', {
Expand Down
8 changes: 3 additions & 5 deletions packages/contracts/test/contracts/L1/rollup/StateCommitmentChain.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { smock, FakeContract } from '@defi-wonderland/smock'
import { expect } from '../../../setup'
import {
deploy,
setProxyTarget,
NON_NULL_BYTES32,
getEthTime,
increaseEthTime,
Expand All @@ -30,15 +29,14 @@ describe('StateCommitmentChain', () => {
'CanonicalTransactionChain'
)

await setProxyTarget(
AddressManager,
await AddressManager.setAddress(
'CanonicalTransactionChain',
Fake__CanonicalTransactionChain
Fake__CanonicalTransactionChain.address
)

Fake__BondManager = await smock.fake<Contract>('BondManager')

await setProxyTarget(AddressManager, 'BondManager', Fake__BondManager)
await AddressManager.setAddress('BondManager', Fake__BondManager.address)

Fake__BondManager.isCollateralized.returns(true)

Expand Down
1 change: 0 additions & 1 deletion packages/contracts/test/helpers/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export * from './dummy'
export * from './constants'
export * from './resolver'
export * from './utils'
export * from './codec'
export * from './test-runner'
Expand Down
17 changes: 0 additions & 17 deletions packages/contracts/test/helpers/resolver/address-manager.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion packages/contracts/test/helpers/resolver/index.ts
View file
Open in desktop

This file was deleted.