Skip to content

N
nebula
Commit 0541e0cd authored by Kelvin Fichter's avatar Kelvin Fichter
Browse files
Options

Fixed up ExecutionManager tests

parent 66a1932e
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 193 deletions
packages/contracts/package.json
View file @ 0541e0cd
......@@ -9,7 +9,7 @@
"build:contracts": "buidler compile",
"build:copy": "copyfiles -u 2 \"contracts/optimistic-ethereum/**/*.sol\" \"build/contracts\"",
"test": "yarn run test:contracts",
"test:contracts": "buidler test \"test/contracts/libraries/trie/Lib_MerkleTrie.spec.ts\" --show-stack-traces",
"test:contracts": "buidler test --show-stack-traces",
"lint": "tslint --format stylish --project .",
"fix": "prettier --config prettier-config.json --write \"buidler.config.ts\" \"{src,test}/**/*.ts\"",
"clean": "rm -rf ./artifacts ./build ./cache"
......
packages/contracts/test/contracts/OVM/execution/OVM_ExecutionManager/run.spec.ts
View file @ 0541e0cd
......@@ -71,7 +71,6 @@ const test_run: TestDefinition = {
parameters: [
{
name: 'run => ovmCALL(ADDRESS_1) => ovmADDRESS',
focus: true,
steps: [
{
functionName: 'run',
......
packages/contracts/test/contracts/OVM/execution/OVM_SafetyChecker.spec.ts
View file @ 0541e0cd
......@@ -17,7 +17,7 @@ describe('OVM_SafetyChecker', () => {
OVM_SafetyChecker = await Factory__OVM_SafetyChecker.deploy()
})
describe('isBytecodeSafe()', () => {
describe.skip('isBytecodeSafe()', () => {
for (const testName of Object.keys(SAFETY_CHECKER_TEST_JSON)) {
const test = SAFETY_CHECKER_TEST_JSON[testName]
it(`should correctly classify: ${testName}`, async () => {
......
packages/contracts/test/contracts/OVM/verification/OVM_FraudVerifier.spec.ts
View file @ 0541e0cd
......@@ -2,48 +2,24 @@ import { expect } from '../../../setup'
/* External Imports */
import { ethers } from '@nomiclabs/buidler'
import { ContractFactory, Contract, Signer, BigNumber } from 'ethers'
import { ContractFactory, Contract, BigNumber } from 'ethers'
import { smockit, MockContract } from '@eth-optimism/smock'
/* Internal Imports */
/*
import {
getProxyManager,
getMockContract,
MockContract,
ZERO_ADDRESS,
NULL_BYTES32,
NON_NULL_BYTES32,
makeAddressManager,
setProxyTarget,
DUMMY_BATCH_HEADERS,
DUMMY_BATCH_PROOFS,
DUMMY_OVM_TRANSACTIONS,
NON_NULL_BYTES32,
NULL_BYTES32,
} from '../../../helpers'
const DUMMY_BATCH_HEADER = {
batchIndex: 0,
batchRoot: NULL_BYTES32,
batchSize: 0,
prevTotalElements: 0,
extraData: NULL_BYTES32,
}
const DUMMY_BATCH_PROOF = {
index: 0,
siblings: [NULL_BYTES32],
}
const DUMMY_OVM_TRANSACTION = {
timestamp: 0,
queueOrigin: 0,
entrypoint: ZERO_ADDRESS,
origin: ZERO_ADDRESS,
msgSender: ZERO_ADDRESS,
gasLimit: 0,
data: NULL_BYTES32,
}
describe('OVM_FraudVerifier', () => {
let Proxy_Manager: Contract
let AddressManager: Contract
before(async () => {
Proxy_Manager = await getProxyManager()
AddressManager = await makeAddressManager()
})
let Mock__OVM_StateCommitmentChain: MockContract
......@@ -51,49 +27,43 @@ describe('OVM_FraudVerifier', () => {
let Mock__OVM_StateTransitioner: MockContract
let Mock__OVM_StateTransitionerFactory: MockContract
before(async () => {
Mock__OVM_StateCommitmentChain = await getMockContract(
Mock__OVM_StateCommitmentChain = smockit(
await ethers.getContractFactory('OVM_StateCommitmentChain')
)
Mock__OVM_CanonicalTransactionChain = await getMockContract(
Mock__OVM_CanonicalTransactionChain = smockit(
await ethers.getContractFactory('OVM_CanonicalTransactionChain')
)
Mock__OVM_StateTransitioner = await getMockContract(
Mock__OVM_StateTransitioner = smockit(
await ethers.getContractFactory('OVM_StateTransitioner')
)
Mock__OVM_StateTransitionerFactory = await getMockContract(
Mock__OVM_StateTransitionerFactory = smockit(
await ethers.getContractFactory('OVM_StateTransitionerFactory')
)
await setProxyTarget(
Proxy_Manager,
AddressManager,
'OVM_StateCommitmentChain',
Mock__OVM_StateCommitmentChain
)
await setProxyTarget(
Proxy_Manager,
AddressManager,
'OVM_CanonicalTransactionChain',
Mock__OVM_CanonicalTransactionChain
)
await setProxyTarget(
Proxy_Manager,
'OVM_StateTransitioner',
Mock__OVM_StateTransitioner
)
await setProxyTarget(
Proxy_Manager,
AddressManager,
'OVM_StateTransitionerFactory',
Mock__OVM_StateTransitionerFactory
)
Mock__OVM_StateTransitionerFactory.setReturnValues('create', [
Mock__OVM_StateTransitioner.address,
])
Mock__OVM_StateTransitionerFactory.smocked.create.will.return.with(
Mock__OVM_StateTransitioner.address
)
})
let Factory__OVM_FraudVerifier: ContractFactory
......@@ -106,25 +76,27 @@ describe('OVM_FraudVerifier', () => {
let OVM_FraudVerifier: Contract
beforeEach(async () => {
OVM_FraudVerifier = await Factory__OVM_FraudVerifier.deploy(
Proxy_Manager.address
AddressManager.address
)
})
describe('initializeFraudVerification', () => {
describe('when provided an invalid pre-state root inclusion proof', () => {
before(() => {
Mock__OVM_StateCommitmentChain.setReturnValues('verifyElement', [false])
Mock__OVM_StateCommitmentChain.smocked.verifyElement.will.return.with(
false
)
})
it('should revert', async () => {
await expect(
OVM_FraudVerifier.initializeFraudVerification(
NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF,
DUMMY_OVM_TRANSACTION,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0],
DUMMY_OVM_TRANSACTIONS[0],
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0]
)
).to.be.revertedWith('Invalid pre-state root inclusion proof.')
})
......@@ -132,25 +104,27 @@ describe('OVM_FraudVerifier', () => {
describe('when provided a valid pre-state root inclusion proof', () => {
before(() => {
Mock__OVM_StateCommitmentChain.setReturnValues('verifyElement', [true])
Mock__OVM_StateCommitmentChain.smocked.verifyElement.will.return.with(
true
)
})
describe('when provided an invalid transaction inclusion proof', () => {
before(() => {
Mock__OVM_CanonicalTransactionChain.setReturnValues('verifyElement', [
false,
])
Mock__OVM_CanonicalTransactionChain.smocked.verifyElement.will.return.with(
false
)
})
it('should revert', async () => {
await expect(
OVM_FraudVerifier.initializeFraudVerification(
NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF,
DUMMY_OVM_TRANSACTION,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0],
DUMMY_OVM_TRANSACTIONS[0],
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0]
)
).to.be.revertedWith('Invalid transaction inclusion proof.')
})
......@@ -158,20 +132,20 @@ describe('OVM_FraudVerifier', () => {
describe('when provided a valid transaction inclusion proof', () => {
before(() => {
Mock__OVM_CanonicalTransactionChain.setReturnValues('verifyElement', [
true,
])
Mock__OVM_CanonicalTransactionChain.smocked.verifyElement.will.return.with(
true
)
})
it('should deploy a new state transitioner', async () => {
await expect(
OVM_FraudVerifier.initializeFraudVerification(
NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF,
DUMMY_OVM_TRANSACTION,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0],
DUMMY_OVM_TRANSACTIONS[0],
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0]
)
).to.not.be.reverted
......@@ -185,34 +159,37 @@ describe('OVM_FraudVerifier', () => {
describe('finalizeFraudVerification', () => {
beforeEach(async () => {
Mock__OVM_StateCommitmentChain.setReturnValues('verifyElement', [true])
Mock__OVM_CanonicalTransactionChain.setReturnValues('verifyElement', [
true,
])
Mock__OVM_StateCommitmentChain.smocked.verifyElement.will.return.with(
true
)
Mock__OVM_CanonicalTransactionChain.smocked.verifyElement.will.return.with(
true
)
await OVM_FraudVerifier.initializeFraudVerification(
NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF,
DUMMY_OVM_TRANSACTION,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0],
DUMMY_OVM_TRANSACTIONS[0],
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0]
)
})
describe('when the transition process is not complete', () => {
before(() => {
Mock__OVM_StateTransitioner.setReturnValues('isComplete', [false])
before(async () => {
Mock__OVM_StateTransitioner.smocked.isComplete.will.return.with(false)
})
it('should revert', async () => {
await expect(
OVM_FraudVerifier.finalizeFraudVerification(
NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF,
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0],
NON_NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0]
)
).to.be.revertedWith(
'State transition process must be completed prior to finalization.'
......@@ -222,23 +199,23 @@ describe('OVM_FraudVerifier', () => {
describe('when the transition process is complete', () => {
before(() => {
Mock__OVM_StateTransitioner.setReturnValues('isComplete', [true])
Mock__OVM_StateTransitioner.smocked.isComplete.will.return.with(true)
})
describe('when provided an invalid post-state root index', () => {
const batchProof = {
...DUMMY_BATCH_PROOF,
index: DUMMY_BATCH_PROOF.index + 2,
...DUMMY_BATCH_PROOFS[0],
index: DUMMY_BATCH_PROOFS[0].index + 2,
}
it('should revert', async () => {
await expect(
OVM_FraudVerifier.finalizeFraudVerification(
NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF,
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0],
NON_NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_HEADERS[0],
batchProof
)
).to.be.revertedWith('Invalid post-state root index.')
......@@ -247,25 +224,25 @@ describe('OVM_FraudVerifier', () => {
describe('when provided a valid post-state root index', () => {
const batchProof = {
...DUMMY_BATCH_PROOF,
index: DUMMY_BATCH_PROOF.index + 1,
...DUMMY_BATCH_PROOFS[0],
index: DUMMY_BATCH_PROOFS[0].index + 1,
}
describe('when provided an invalid pre-state root inclusion proof', () => {
beforeEach(() => {
Mock__OVM_StateCommitmentChain.setReturnValues('verifyElement', [
false,
])
Mock__OVM_StateCommitmentChain.smocked.verifyElement.will.return.with(
false
)
})
it('should revert', async () => {
await expect(
OVM_FraudVerifier.finalizeFraudVerification(
NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF,
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0],
NON_NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_HEADERS[0],
batchProof
)
).to.be.revertedWith('Invalid pre-state root inclusion proof.')
......@@ -274,17 +251,16 @@ describe('OVM_FraudVerifier', () => {
describe('when provided a valid pre-state root inclusion proof', () => {
before(() => {
Mock__OVM_StateCommitmentChain.setReturnValues('verifyElement', [
true,
])
Mock__OVM_StateCommitmentChain.smocked.verifyElement.will.return.with(
true
)
})
describe('when provided an invalid post-state root inclusion proof', () => {
beforeEach(() => {
Mock__OVM_StateCommitmentChain.setReturnValues(
'verifyElement',
Mock__OVM_StateCommitmentChain.smocked.verifyElement.will.return.with(
(stateRoot: string, ...args: any) => {
return [stateRoot !== NON_NULL_BYTES32]
return stateRoot !== NON_NULL_BYTES32
}
)
})
......@@ -293,10 +269,10 @@ describe('OVM_FraudVerifier', () => {
await expect(
OVM_FraudVerifier.finalizeFraudVerification(
NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF,
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0],
NON_NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_HEADERS[0],
batchProof
)
).to.be.revertedWith('Invalid post-state root inclusion proof.')
......@@ -305,16 +281,15 @@ describe('OVM_FraudVerifier', () => {
describe('when provided a valid post-state root inclusion proof', () => {
before(() => {
Mock__OVM_StateCommitmentChain.setReturnValues('verifyElement', [
true,
])
Mock__OVM_StateCommitmentChain.smocked.verifyElement.will.return.with(
true
)
})
describe('when the provided post-state root does not differ from the computed one', () => {
before(() => {
Mock__OVM_StateTransitioner.setReturnValues(
'getPostStateRoot',
[NON_NULL_BYTES32]
Mock__OVM_StateTransitioner.smocked.getPostStateRoot.will.return.with(
NON_NULL_BYTES32
)
})
......@@ -322,10 +297,10 @@ describe('OVM_FraudVerifier', () => {
await expect(
OVM_FraudVerifier.finalizeFraudVerification(
NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF,
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0],
NON_NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_HEADERS[0],
batchProof
)
).to.be.revertedWith(
......@@ -336,29 +311,26 @@ describe('OVM_FraudVerifier', () => {
describe('when the provided post-state root differs from the computed one', () => {
before(() => {
Mock__OVM_StateTransitioner.setReturnValues(
'getPostStateRoot',
[NULL_BYTES32]
Mock__OVM_StateTransitioner.smocked.getPostStateRoot.will.return.with(
NULL_BYTES32
)
})
it('should succeed and attempt to delete a state batch', async () => {
await OVM_FraudVerifier.finalizeFraudVerification(
NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_PROOF,
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS[0],
NON_NULL_BYTES32,
DUMMY_BATCH_HEADER,
DUMMY_BATCH_HEADERS[0],
batchProof
)
expect(
Mock__OVM_StateCommitmentChain.getCallData(
'deleteStateBatch',
0
)
Mock__OVM_StateCommitmentChain.smocked.deleteStateBatch
.calls[0]
).to.deep.equal([
Object.values(DUMMY_BATCH_HEADER).map((value) => {
Object.values(DUMMY_BATCH_HEADERS[0]).map((value) => {
return Number.isInteger(value)
? BigNumber.from(value)
: value
......@@ -372,4 +344,3 @@ describe('OVM_FraudVerifier', () => {
})
})
})
*/
packages/contracts/test/contracts/libraries/trie/Lib_EthMerkleTrie.spec.ts deleted 100644 → 0
View file @ 66a1932e
/* Internal Imports */
import { Lib_EthMerkleTrie_TEST_JSON } from '../../../data'
import { runJsonTest } from '../../../helpers'
describe('Lib_EthMerkleTrie', () => {
describe('JSON tests', () => {
runJsonTest('TestLib_EthMerkleTrie', Lib_EthMerkleTrie_TEST_JSON)
})
})
packages/contracts/test/contracts/libraries/trie/Lib_SecureMerkleTrie.spec.ts deleted 100644 → 0
View file @ 66a1932e
/* Internal Imports */
import { Lib_SecureMerkleTrie_TEST_JSON } from '../../../data'
import { runJsonTest } from '../../../helpers'
describe('Lib_SecureMerkleTrie', () => {
describe('JSON tests', () => {
runJsonTest('TestLib_SecureMerkleTrie', Lib_SecureMerkleTrie_TEST_JSON)
})
})
packages/contracts/test/data/index.ts
View file @ 0541e0cd
......@@ -3,7 +3,5 @@ export { tests as Lib_Bytes32Utils_TEST_JSON } from './json/libraries/utils/Lib_
export { tests as Lib_BytesUtils_TEST_JSON } from './json/libraries/utils/Lib_BytesUtils.test.json'
export { tests as Lib_ECDSAUtils_TEST_JSON } from './json/libraries/utils/Lib_ECDSAUtils.test.json'
export { tests as Lib_MerkleTrie_TEST_JSON } from './json/libraries/trie/Lib_MerkleTrie.test.json'
export { tests as Lib_SecureMerkleTrie_TEST_JSON } from './json/libraries/trie/Lib_SecureMerkleTrie.test.json'
export { tests as Lib_EthMerkleTrie_TEST_JSON } from './json/libraries/trie/Lib_EthMerkleTrie.test.json'
export { tests as CREATE2_TEST_JSON } from './json/create2.test.json'
export { tests as SAFETY_CHECKER_TEST_JSON } from './json/safety-checker.test.json'
packages/contracts/test/data/json/libraries/trie/Lib_EthMerkleTrie.test.json deleted 100644 → 0
View file @ 66a1932e
{
"tests": {
"proveAccountStorageSlotValue": {
"single account, single storage slot": {
},
"single account, multiple storage slots": {
},
"multiple accounts, multiple storage slots": {
}
},
"updateAccountStorageSlotValue": {
"single account, single storage slot": {
},
"single account, multiple storage slots": {
},
"multiple accounts, multiple storage slots": {
}
},
"proveAccountState": {
"account within trie with a single account": {
},
"account within trie with multiple accounts": {
}
},
"updateAccountState": {
"account within trie with a single account": {
},
"account within trie with multiple accounts": {
}
}
}
}
\ No newline at end of file
packages/contracts/test/helpers/dummy/batches.ts 0 → 100644
View file @ 0541e0cd
import { NULL_BYTES32 } from '../constants'
export const DUMMY_BATCH_HEADERS = [
{
batchIndex: 0,
batchRoot: NULL_BYTES32,
batchSize: 0,
prevTotalElements: 0,
extraData: NULL_BYTES32,
},
]
export const DUMMY_BATCH_PROOFS = [
{
index: 0,
siblings: [NULL_BYTES32],
},
]
packages/contracts/test/helpers/dummy/index.ts
View file @ 0541e0cd
......@@ -2,3 +2,5 @@ export * from './accounts'
export * from './bytes32'
export * from './context'
export * from './bytecode'
export * from './batches'
export * from './transactions'
packages/contracts/test/helpers/dummy/transactions.ts 0 → 100644
View file @ 0541e0cd
import { ZERO_ADDRESS, NULL_BYTES32 } from '../constants'
export const DUMMY_OVM_TRANSACTIONS = [
{
timestamp: 0,
number: 0,
l1QueueOrigin: 0,
l1Txorigin: ZERO_ADDRESS,
entrypoint: ZERO_ADDRESS,
gasLimit: 0,
data: NULL_BYTES32,
},
]
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