Commit 203907a1 authored by ben-chain's avatar ben-chain

port types etc, test running

parent 3013627d
...@@ -327,11 +327,13 @@ export class ExecutionManagerTestRunner { ...@@ -327,11 +327,13 @@ export class ExecutionManagerTestRunner {
if (isTestStep_CALL(step)) { if (isTestStep_CALL(step)) {
if (step.expectedReturnValue === '0x00') { if (step.expectedReturnValue === '0x00') {
return step.expectedReturnValue return step.expectedReturnValue
} else { } else if (typeof step.expectedReturnValue === 'string' || step.expectedReturnValue === undefined) {
returnData = [ returnData = [
step.expectedReturnStatus, step.expectedReturnStatus,
step.expectedReturnValue || '0x', step.expectedReturnValue || '0x',
] ]
} else {
returnData = [step.expectedReturnValue.ovmSuccess, step.expectedReturnValue.returnData]
} }
} else if (BigNumber.isBigNumber(step.expectedReturnValue)) { } else if (BigNumber.isBigNumber(step.expectedReturnValue)) {
returnData = [step.expectedReturnValue.toHexString()] returnData = [step.expectedReturnValue.toHexString()]
......
...@@ -92,7 +92,7 @@ export interface TestStep_CALL { ...@@ -92,7 +92,7 @@ export interface TestStep_CALL {
subSteps?: TestStep[] subSteps?: TestStep[]
} }
expectedReturnStatus: boolean expectedReturnStatus: boolean
expectedReturnValue?: string | RevertFlagError expectedReturnValue?: string | RevertFlagError | {ovmSuccess: boolean, returnData: string}
} }
interface TestStep_CREATE { interface TestStep_CREATE {
......
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