Skip to content

N
nebula
Commit 6f56935c authored by ben-chain's avatar ben-chain
Browse files
Options

more test setup and var renaming

parent d58512e9
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 102 deletions
packages/contracts/buidler.config.ts
View file @ 6f56935c
import { usePlugin, BuidlerConfig } from '@nomiclabs/buidler/config'
import { DEFAULT_ACCOUNTS_BUIDLER, GAS_LIMIT } from './test/helpers/constants'
import { DEFAULT_ACCOUNTS_BUIDLER, RUN_OVM_TEST_GAS } from './test/helpers/constants'
usePlugin('@nomiclabs/buidler-ethers')
usePlugin('@nomiclabs/buidler-waffle')
......@@ -11,7 +11,7 @@ const config: BuidlerConfig = {
networks: {
buidlerevm: {
accounts: DEFAULT_ACCOUNTS_BUIDLER,
blockGasLimit: GAS_LIMIT * 2,
blockGasLimit: RUN_OVM_TEST_GAS * 2,
},
},
mocha: {
......
packages/contracts/test/contracts/OVM/execution/OVM_ExecutionManager/context-opcodes.spec.ts
View file @ 6f56935c
......@@ -2,7 +2,7 @@
import {
runExecutionManagerTest,
TestDefinition,
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
NULL_BYTES32,
NON_NULL_BYTES32,
REVERT_FLAGS,
......
packages/contracts/test/contracts/OVM/execution/OVM_ExecutionManager/nuisance-gas.spec.ts
View file @ 6f56935c
......@@ -2,7 +2,7 @@
import {
ExecutionManagerTestRunner,
TestDefinition,
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
NON_NULL_BYTES32,
REVERT_FLAGS,
VERIFIED_EMPTY_CONTRACT_HASH,
......@@ -20,7 +20,7 @@ import {
ovmStateManager: '$OVM_STATE_MANAGER',
ovmSafetyChecker: '$OVM_SAFETY_CHECKER',
messageRecord: {
nuisanceGasLeft: GAS_LIMIT,
nuisanceGasLeft: OVM_TX_GAS_LIMIT,
},
},
StateManager: {
......@@ -47,7 +47,7 @@ import {
postState: {
ExecutionManager: {
messageRecord: {
nuisanceGasLeft: GAS_LIMIT / 2
nuisanceGasLeft: OVM_TX_GAS_LIMIT / 2
}
}
},
......@@ -56,14 +56,10 @@ import {
name: 'single ovmCALL',
focus: true,
steps: [
// do a non-nuisance gas consuming opcode (test auto-wraps in ovmCALL)
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT / 2,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: []
},
expectedReturnStatus: true,
functionName: 'ovmADDRESS',
expectedReturnValue: "$DUMMY_OVM_ADDRESS_1"
},
],
}
......@@ -77,7 +73,7 @@ import {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......@@ -101,7 +97,7 @@ import {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......@@ -127,7 +123,7 @@ import {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......@@ -151,13 +147,13 @@ import {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
......@@ -184,13 +180,13 @@ import {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_3',
calldata: '0x',
},
......@@ -209,7 +205,7 @@ import {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......@@ -232,7 +228,7 @@ import {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......
packages/contracts/test/contracts/OVM/execution/OVM_ExecutionManager/ovmCALL.spec.ts
View file @ 6f56935c
......@@ -2,7 +2,7 @@
import {
ExecutionManagerTestRunner,
TestDefinition,
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
NON_NULL_BYTES32,
REVERT_FLAGS,
VERIFIED_EMPTY_CONTRACT_HASH,
......@@ -18,7 +18,7 @@ const test_ovmCALL: TestDefinition = {
ovmStateManager: '$OVM_STATE_MANAGER',
ovmSafetyChecker: '$OVM_SAFETY_CHECKER',
messageRecord: {
nuisanceGasLeft: GAS_LIMIT,
nuisanceGasLeft: OVM_TX_GAS_LIMIT,
},
},
StateManager: {
......@@ -46,7 +46,7 @@ const test_ovmCALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......@@ -65,7 +65,7 @@ const test_ovmCALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......@@ -89,7 +89,7 @@ const test_ovmCALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......@@ -115,7 +115,7 @@ const test_ovmCALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......@@ -139,13 +139,13 @@ const test_ovmCALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
......@@ -172,13 +172,13 @@ const test_ovmCALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_3',
calldata: '0x',
},
......@@ -197,7 +197,7 @@ const test_ovmCALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......@@ -220,7 +220,7 @@ const test_ovmCALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......
packages/contracts/test/contracts/OVM/execution/OVM_ExecutionManager/ovmCREATE.spec.ts
View file @ 6f56935c
......@@ -2,7 +2,7 @@
import {
ExecutionManagerTestRunner,
TestDefinition,
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
NULL_BYTES32,
NON_NULL_BYTES32,
REVERT_FLAGS,
......@@ -26,7 +26,7 @@ const test_ovmCREATE: TestDefinition = {
ovmStateManager: '$OVM_STATE_MANAGER',
ovmSafetyChecker: '$OVM_SAFETY_CHECKER',
messageRecord: {
nuisanceGasLeft: GAS_LIMIT,
nuisanceGasLeft: OVM_TX_GAS_LIMIT,
},
},
StateManager: {
......@@ -278,7 +278,7 @@ const test_ovmCREATE: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......@@ -358,7 +358,7 @@ const test_ovmCREATE: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: CREATED_CONTRACT_1,
subSteps: [
{
......@@ -394,7 +394,7 @@ const test_ovmCREATE: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......@@ -417,7 +417,7 @@ const test_ovmCREATE: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......@@ -445,7 +445,7 @@ const test_ovmCREATE: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
......@@ -474,7 +474,7 @@ const test_ovmCREATE: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
......@@ -502,7 +502,7 @@ const test_ovmCREATE: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_3',
calldata: '0x',
},
......@@ -533,7 +533,7 @@ const test_ovmCREATE: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_3',
calldata: '0x',
},
......
packages/contracts/test/contracts/OVM/execution/OVM_ExecutionManager/ovmDELEGATECALL.spec.ts
View file @ 6f56935c
......@@ -2,7 +2,7 @@
import {
ExecutionManagerTestRunner,
TestDefinition,
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
NULL_BYTES32,
NON_NULL_BYTES32,
REVERT_FLAGS,
......@@ -20,7 +20,7 @@ const test_ovmDELEGATECALL: TestDefinition = {
ovmStateManager: '$OVM_STATE_MANAGER',
ovmSafetyChecker: '$OVM_SAFETY_CHECKER',
messageRecord: {
nuisanceGasLeft: GAS_LIMIT,
nuisanceGasLeft: OVM_TX_GAS_LIMIT,
},
},
StateManager: {
......@@ -60,13 +60,13 @@ const test_ovmDELEGATECALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
functionName: 'ovmDELEGATECALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
......@@ -90,19 +90,19 @@ const test_ovmDELEGATECALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
functionName: 'ovmDELEGATECALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
......@@ -130,13 +130,13 @@ const test_ovmDELEGATECALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
functionName: 'ovmDELEGATECALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
......@@ -171,13 +171,13 @@ const test_ovmDELEGATECALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
functionName: 'ovmDELEGATECALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
......@@ -205,25 +205,25 @@ const test_ovmDELEGATECALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
functionName: 'ovmDELEGATECALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
functionName: 'ovmDELEGATECALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_3',
subSteps: [
{
......@@ -255,25 +255,25 @@ const test_ovmDELEGATECALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
functionName: 'ovmDELEGATECALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
functionName: 'ovmDELEGATECALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_3',
subSteps: [
{
......@@ -305,25 +305,25 @@ const test_ovmDELEGATECALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
functionName: 'ovmDELEGATECALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_2',
subSteps: [
{
functionName: 'ovmDELEGATECALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_3',
subSteps: [
{
......
packages/contracts/test/contracts/OVM/execution/OVM_ExecutionManager/ovmREVERT.spec.ts
View file @ 6f56935c
......@@ -2,7 +2,7 @@
import {
runExecutionManagerTest,
TestDefinition,
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
NULL_BYTES32,
NON_NULL_BYTES32,
REVERT_FLAGS,
......@@ -16,7 +16,7 @@ const test_ovmREVERT: TestDefinition = {
ovmStateManager: '$OVM_STATE_MANAGER',
ovmSafetyChecker: '$OVM_SAFETY_CHECKER',
messageRecord: {
nuisanceGasLeft: GAS_LIMIT,
nuisanceGasLeft: OVM_TX_GAS_LIMIT,
},
},
StateManager: {
......@@ -38,7 +38,7 @@ const test_ovmREVERT: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: [
GAS_LIMIT / 2,
OVM_TX_GAS_LIMIT / 2,
'$DUMMY_OVM_ADDRESS_1',
[
{
......@@ -48,7 +48,7 @@ const test_ovmREVERT: TestDefinition = {
expectedReturnValues: [
REVERT_FLAGS.INTENTIONAL_REVERT,
'0xdeadbeef',
GAS_LIMIT / 2,
OVM_TX_GAS_LIMIT / 2,
0,
],
},
......
packages/contracts/test/contracts/OVM/execution/OVM_ExecutionManager/ovmSLOAD.spec.ts
View file @ 6f56935c
......@@ -2,7 +2,7 @@
import {
runExecutionManagerTest,
TestDefinition,
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
NULL_BYTES32,
NON_NULL_BYTES32,
REVERT_FLAGS,
......@@ -17,7 +17,7 @@ const test_ovmSLOAD: TestDefinition = {
ovmStateManager: '$OVM_STATE_MANAGER',
ovmSafetyChecker: '$OVM_SAFETY_CHECKER',
messageRecord: {
nuisanceGasLeft: GAS_LIMIT,
nuisanceGasLeft: OVM_TX_GAS_LIMIT,
},
},
StateManager: {
......@@ -45,7 +45,7 @@ const test_ovmSLOAD: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: [
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
'$DUMMY_OVM_ADDRESS_1',
[
{
......
packages/contracts/test/contracts/OVM/execution/OVM_ExecutionManager/ovmSTATICCALL.spec.ts
View file @ 6f56935c
......@@ -2,7 +2,7 @@
import {
runExecutionManagerTest,
TestDefinition,
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
NULL_BYTES32,
NON_NULL_BYTES32,
REVERT_FLAGS,
......@@ -16,7 +16,7 @@ const test_ovmSTATICCALL: TestDefinition = {
ovmStateManager: '$OVM_STATE_MANAGER',
ovmSafetyChecker: '$OVM_SAFETY_CHECKER',
messageRecord: {
nuisanceGasLeft: GAS_LIMIT,
nuisanceGasLeft: OVM_TX_GAS_LIMIT,
},
},
StateManager: {
......@@ -44,13 +44,13 @@ const test_ovmSTATICCALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: [
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
'$DUMMY_OVM_ADDRESS_1',
[
{
functionName: 'ovmSTATICCALL',
functionParams: [
GAS_LIMIT / 2,
OVM_TX_GAS_LIMIT / 2,
'$DUMMY_OVM_ADDRESS_2',
[
{
......@@ -60,7 +60,7 @@ const test_ovmSTATICCALL: TestDefinition = {
expectedReturnValues: [
REVERT_FLAGS.STATIC_VIOLATION,
'0x',
GAS_LIMIT / 2,
OVM_TX_GAS_LIMIT / 2,
0,
],
},
......@@ -71,7 +71,7 @@ const test_ovmSTATICCALL: TestDefinition = {
expectedReturnValues: [
REVERT_FLAGS.STATIC_VIOLATION,
'0x',
GAS_LIMIT / 2,
OVM_TX_GAS_LIMIT / 2,
0,
],
},
......@@ -110,19 +110,19 @@ const test_ovmSTATICCALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: [
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
'$DUMMY_OVM_ADDRESS_1',
[
{
functionName: 'ovmSTATICCALL',
functionParams: [
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
'$DUMMY_OVM_ADDRESS_2',
[
{
functionName: 'ovmCALL',
functionParams: [
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
'$DUMMY_OVM_ADDRESS_2',
[
{
......@@ -175,18 +175,18 @@ const test_ovmSTATICCALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: [
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
'$DUMMY_OVM_ADDRESS_1',
[
{
functionName: 'ovmSTATICCALL',
functionParams: [
GAS_LIMIT / 2,
OVM_TX_GAS_LIMIT / 2,
'$DUMMY_OVM_ADDRESS_2',
[
{
functionName: 'ovmSTATICCALL',
functionParams: [GAS_LIMIT, '$DUMMY_OVM_ADDRESS_2', []],
functionParams: [OVM_TX_GAS_LIMIT, '$DUMMY_OVM_ADDRESS_2', []],
expectedReturnStatus: true,
expectedReturnValues: [],
},
......@@ -197,7 +197,7 @@ const test_ovmSTATICCALL: TestDefinition = {
expectedReturnValues: [
REVERT_FLAGS.STATIC_VIOLATION,
'0x',
GAS_LIMIT / 2,
OVM_TX_GAS_LIMIT / 2,
33806,
],
},
......@@ -218,15 +218,15 @@ const test_ovmSTATICCALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: [
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
'$DUMMY_OVM_ADDRESS_1',
[
{
functionName: 'ovmSTATICCALLToRevert',
functionParams: [
GAS_LIMIT / 2,
OVM_TX_GAS_LIMIT / 2,
'$DUMMY_OVM_ADDRESS_2',
[REVERT_FLAGS.STATIC_VIOLATION, '0x', GAS_LIMIT / 2, 0],
[REVERT_FLAGS.STATIC_VIOLATION, '0x', OVM_TX_GAS_LIMIT / 2, 0],
],
expectedReturnStatus: true,
expectedReturnValues: [false, '0x'],
......@@ -243,21 +243,21 @@ const test_ovmSTATICCALL: TestDefinition = {
{
functionName: 'ovmCALL',
functionParams: [
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
'$DUMMY_OVM_ADDRESS_1',
[
{
functionName: 'ovmSTATICCALL',
functionParams: [
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
'$DUMMY_OVM_ADDRESS_1',
[
{
functionName: 'ovmSTATICCALLToRevert',
functionParams: [
GAS_LIMIT / 2,
OVM_TX_GAS_LIMIT / 2,
'$DUMMY_OVM_ADDRESS_2',
[REVERT_FLAGS.STATIC_VIOLATION, '0x', GAS_LIMIT / 2, 0],
[REVERT_FLAGS.STATIC_VIOLATION, '0x', OVM_TX_GAS_LIMIT / 2, 0],
],
expectedReturnStatus: true,
expectedReturnValues: [false, '0x'],
......
packages/contracts/test/contracts/OVM/execution/OVM_ExecutionManager/run.spec.ts
View file @ 6f56935c
......@@ -2,7 +2,7 @@
import {
ExecutionManagerTestRunner,
TestDefinition,
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
NON_NULL_BYTES32,
REVERT_FLAGS,
ZERO_ADDRESS,
......@@ -32,7 +32,7 @@ const test_run: TestDefinition = {
ovmStateManager: '$OVM_STATE_MANAGER',
ovmSafetyChecker: '$OVM_SAFETY_CHECKER',
messageRecord: {
nuisanceGasLeft: GAS_LIMIT,
nuisanceGasLeft: OVM_TX_GAS_LIMIT,
},
},
StateManager: {
......@@ -84,12 +84,12 @@ const test_run: TestDefinition = {
entrypoint: '$OVM_CALL_HELPER',
origin: ZERO_ADDRESS,
msgSender: ZERO_ADDRESS,
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
subSteps: [
{
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: '$DUMMY_OVM_ADDRESS_1',
subSteps: [
{
......
packages/contracts/test/helpers/constants.ts
View file @ 6f56935c
......@@ -13,7 +13,7 @@ export const DEFAULT_ACCOUNTS_BUIDLER = defaultAccounts.map((account) => {
}
})
export const GAS_LIMIT = 10_000_000
export const OVM_TX_GAS_LIMIT = 10_000_000
export const RUN_OVM_TEST_GAS = 20_000_000
export const NULL_BYTES32 = makeHexString('00', 32)
......
packages/contracts/test/helpers/test-utils/test-runner.ts
View file @ 6f56935c
......@@ -29,7 +29,7 @@ import {
} from './test.types'
import { encodeRevertData } from '../codec'
import { getModifiableStorageFactory } from '../storage/contract-storage'
import { GAS_LIMIT, RUN_OVM_TEST_GAS, NON_NULL_BYTES32 } from '../constants'
import { OVM_TX_GAS_LIMIT, RUN_OVM_TEST_GAS, NON_NULL_BYTES32 } from '../constants'
export class ExecutionManagerTestRunner {
private snapshot: string
......@@ -196,7 +196,7 @@ export class ExecutionManagerTestRunner {
const runStep: TestStep_CALL = {
functionName: 'ovmCALL',
functionParams: {
gasLimit: GAS_LIMIT,
gasLimit: OVM_TX_GAS_LIMIT,
target: this.contracts.Helper_TestRunner.address,
subSteps: step.functionParams.subSteps,
},
......@@ -221,7 +221,7 @@ export class ExecutionManagerTestRunner {
)
} else {
await this.contracts.OVM_ExecutionManager.ovmCALL(
GAS_LIMIT,
OVM_TX_GAS_LIMIT,
this.contracts.Helper_TestRunner.address,
this.contracts.Helper_TestRunner.interface.encodeFunctionData(
'runSingleTestStep',
......
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