Skip to content

maint(ct): clean up SCC tests #2499

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 27, 2022
Merged

maint(ct): clean up SCC tests #2499

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb1627e
maint(ct): clean up SCC tests
tonykogias Apr 27, 2022
3e3bec0
Merge branch 'develop' into clean-SCC-tests
mergify[bot] Apr 27, 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
100 changes: 36 additions & 64 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
@@ -1,33 +1,31 @@
/* External Imports */
import { ethers } from 'hardhat'
import { Signer, ContractFactory, Contract, constants } from 'ethers'
import { Contract, constants } from 'ethers'
import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
import { smock, FakeContract } from '@defi-wonderland/smock'

/* Internal Imports */
import { expect } from '../../../setup'
import {
makeAddressManager,
deploy,
setProxyTarget,
NON_NULL_BYTES32,
getEthTime,
increaseEthTime,
} from '../../../helpers'

describe('StateCommitmentChain', () => {
let sequencer: Signer
let user: Signer
let sequencer: SignerWithAddress
let user: SignerWithAddress
const batch = [NON_NULL_BYTES32]
before(async () => {
;[sequencer, user] = await ethers.getSigners()
})

let AddressManager: Contract
before(async () => {
AddressManager = await makeAddressManager()
})

let Fake__CanonicalTransactionChain: FakeContract
let Fake__BondManager: FakeContract
before(async () => {
AddressManager = await deploy('Lib_AddressManager')

Fake__CanonicalTransactionChain = await smock.fake<Contract>(
'CanonicalTransactionChain'
)
Expand All @@ -44,36 +42,23 @@ describe('StateCommitmentChain', () => {

Fake__BondManager.isCollateralized.returns(true)

await AddressManager.setAddress(
'OVM_Proposer',
await sequencer.getAddress()
)
})

let Factory__StateCommitmentChain: ContractFactory
let Factory__ChainStorageContainer: ContractFactory
before(async () => {
Factory__StateCommitmentChain = await ethers.getContractFactory(
'StateCommitmentChain'
)

Factory__ChainStorageContainer = await ethers.getContractFactory(
'ChainStorageContainer'
)
await AddressManager.setAddress('OVM_Proposer', sequencer.address)
})

let StateCommitmentChain: Contract
beforeEach(async () => {
StateCommitmentChain = await Factory__StateCommitmentChain.deploy(
AddressManager.address,
60 * 60 * 24 * 7, // 1 week fraud proof window
60 * 30 // 30 minute sequencer publish window
)
StateCommitmentChain = await deploy('StateCommitmentChain', {
signer: sequencer,
args: [
AddressManager.address,
60 * 60 * 24 * 7, // 1 week fraud proof window
60 * 30, // 30 minute sequencer publish window
],
})

const batches = await Factory__ChainStorageContainer.deploy(
AddressManager.address,
'StateCommitmentChain'
)
const batches = await deploy('ChainStorageContainer', {
args: [AddressManager.address, 'StateCommitmentChain'],
})

await AddressManager.setAddress(
'ChainStorageContainer-SCC-batches',
Expand All @@ -88,18 +73,14 @@ describe('StateCommitmentChain', () => {

describe('appendStateBatch', () => {
describe('when the provided batch is empty', () => {
const batch = []

it('should revert', async () => {
await expect(
StateCommitmentChain.appendStateBatch(batch, 0)
StateCommitmentChain.appendStateBatch([], 0)
).to.be.revertedWith('Cannot submit an empty state batch.')
})
})

describe('when the provided batch is not empty', () => {
const batch = [NON_NULL_BYTES32]

describe('when start index does not match total elements', () => {
it('should revert', async () => {
await expect(
Expand Down Expand Up @@ -143,10 +124,7 @@ describe('StateCommitmentChain', () => {
batch.length * 2
)

await StateCommitmentChain.connect(sequencer).appendStateBatch(
batch,
0
)
await StateCommitmentChain.appendStateBatch(batch, 0)
})

describe('when inside sequencer publish window', () => {
Expand Down Expand Up @@ -193,7 +171,6 @@ describe('StateCommitmentChain', () => {
})

describe('deleteStateBatch', () => {
const batch = [NON_NULL_BYTES32]
const batchHeader = {
batchIndex: 0,
batchRoot: NON_NULL_BYTES32,
Expand All @@ -211,7 +188,7 @@ describe('StateCommitmentChain', () => {
await StateCommitmentChain.appendStateBatch(batch, 0)
batchHeader.extraData = ethers.utils.defaultAbiCoder.encode(
['uint256', 'address'],
[await getEthTime(ethers.provider), await sequencer.getAddress()]
[await getEthTime(ethers.provider), sequencer.address]
)
})

Expand All @@ -234,10 +211,7 @@ describe('StateCommitmentChain', () => {

describe('when the sender is the OVM_FraudVerifier', () => {
before(async () => {
await AddressManager.setAddress(
'OVM_FraudVerifier',
await sequencer.getAddress()
)
await AddressManager.setAddress('OVM_FraudVerifier', sequencer.address)
})

describe('when the provided batch index is greater than the total submitted', () => {
Expand Down Expand Up @@ -300,13 +274,14 @@ describe('StateCommitmentChain', () => {
prevTotalElements: 0,
extraData: ethers.constants.HashZero,
}

it('should revert when timestamp is zero', async () => {
await expect(
StateCommitmentChain.insideFraudProofWindow({
...batchHeader,
extraData: ethers.utils.defaultAbiCoder.encode(
['uint256', 'address'],
[0, await sequencer.getAddress()]
[0, sequencer.address]
),
})
).to.be.revertedWith('Batch header timestamp cannot be zero')
Expand All @@ -322,7 +297,6 @@ describe('StateCommitmentChain', () => {

describe('when one batch element has been inserted', () => {
beforeEach(async () => {
const batch = [NON_NULL_BYTES32]
Fake__CanonicalTransactionChain.getTotalElements.returns(batch.length)
await StateCommitmentChain.appendStateBatch(batch, 0)
})
Expand All @@ -334,9 +308,11 @@ describe('StateCommitmentChain', () => {

describe('when 64 batch elements have been inserted in one batch', () => {
beforeEach(async () => {
const batch = Array(64).fill(NON_NULL_BYTES32)
Fake__CanonicalTransactionChain.getTotalElements.returns(batch.length)
await StateCommitmentChain.appendStateBatch(batch, 0)
const batchArray = Array(64).fill(NON_NULL_BYTES32)
Fake__CanonicalTransactionChain.getTotalElements.returns(
batchArray.length
)
await StateCommitmentChain.appendStateBatch(batchArray, 0)
})

it('should return the number of inserted batch elements', async () => {
Expand All @@ -346,12 +322,12 @@ describe('StateCommitmentChain', () => {

describe('when 32 batch elements have been inserted in each of two batches', () => {
beforeEach(async () => {
const batch = Array(32).fill(NON_NULL_BYTES32)
const batchArray = Array(32).fill(NON_NULL_BYTES32)
Fake__CanonicalTransactionChain.getTotalElements.returns(
batch.length * 2
batchArray.length * 2
)
await StateCommitmentChain.appendStateBatch(batch, 0)
await StateCommitmentChain.appendStateBatch(batch, 32)
await StateCommitmentChain.appendStateBatch(batchArray, 0)
await StateCommitmentChain.appendStateBatch(batchArray, 32)
})

it('should return the number of inserted batch elements', async () => {
Expand All @@ -369,7 +345,6 @@ describe('StateCommitmentChain', () => {

describe('when one batch has been inserted', () => {
beforeEach(async () => {
const batch = [NON_NULL_BYTES32]
Fake__CanonicalTransactionChain.getTotalElements.returns(batch.length)
await StateCommitmentChain.appendStateBatch(batch, 0)
})
Expand All @@ -381,7 +356,6 @@ describe('StateCommitmentChain', () => {

describe('when 8 batches have been inserted', () => {
beforeEach(async () => {
const batch = [NON_NULL_BYTES32]
Fake__CanonicalTransactionChain.getTotalElements.returns(
batch.length * 8
)
Expand Down Expand Up @@ -409,7 +383,6 @@ describe('StateCommitmentChain', () => {
describe('when one batch element has been inserted', () => {
let timestamp
beforeEach(async () => {
const batch = [NON_NULL_BYTES32]
Fake__CanonicalTransactionChain.getTotalElements.returns(batch.length)
await StateCommitmentChain.appendStateBatch(batch, 0)
timestamp = await getEthTime(ethers.provider)
Expand All @@ -424,7 +397,6 @@ describe('StateCommitmentChain', () => {
})

describe('verifyStateCommitment()', () => {
const batch = [NON_NULL_BYTES32]
const batchHeader = {
batchIndex: 0,
batchRoot: NON_NULL_BYTES32,
Expand All @@ -449,7 +421,7 @@ describe('StateCommitmentChain', () => {
await StateCommitmentChain.appendStateBatch(batch, 0)
batchHeader.extraData = ethers.utils.defaultAbiCoder.encode(
['uint256', 'address'],
[await getEthTime(ethers.provider), await sequencer.getAddress()]
[await getEthTime(ethers.provider), sequencer.address]
)
})

Expand Down