Commit 5e998b27 authored by inphi's avatar inphi

linting; assertEq

parent 28046fb1
...@@ -679,31 +679,26 @@ contract FFIInterface is Test { ...@@ -679,31 +679,26 @@ contract FFIInterface is Test {
return abi.decode(vm.ffi(cmds), (bytes32, bytes, bytes, bytes[])); return abi.decode(vm.ffi(cmds), (bytes32, bytes, bytes, bytes[]));
} }
function getCannonMemoryProof(uint32 pc, uint32 insn) function getCannonMemoryProof(uint32 pc, uint32 insn) external returns (bytes32, bytes memory) {
external
returns (
bytes32,
bytes memory
) {
string[] memory cmds = new string[](4); string[] memory cmds = new string[](4);
cmds[0] = "scripts/differential-testing/differential-testing"; cmds[0] = "scripts/differential-testing/differential-testing";
cmds[1] = "cannonMemoryProof"; cmds[1] = "cannonMemoryProof";
cmds[2] = vm.toString(pc); cmds[2] = vm.toString(pc);
cmds[3] = vm.toString(insn); cmds[3] = vm.toString(insn);
bytes memory result = vm.ffi(cmds); bytes memory result = vm.ffi(cmds);
( (bytes32 memRoot, bytes memory proof) = abi.decode(result, (bytes32, bytes));
bytes32 memRoot,
bytes memory proof
) = abi.decode(result, (bytes32, bytes));
return (memRoot, proof); return (memRoot, proof);
} }
function getCannonMemoryProof(uint32 pc, uint32 insn, uint32 memAddr, uint32 memVal) function getCannonMemoryProof(
uint32 pc,
uint32 insn,
uint32 memAddr,
uint32 memVal
)
external external
returns ( returns (bytes32, bytes memory)
bytes32, {
bytes memory
) {
string[] memory cmds = new string[](6); string[] memory cmds = new string[](6);
cmds[0] = "scripts/differential-testing/differential-testing"; cmds[0] = "scripts/differential-testing/differential-testing";
cmds[1] = "cannonMemoryProof"; cmds[1] = "cannonMemoryProof";
...@@ -712,10 +707,7 @@ contract FFIInterface is Test { ...@@ -712,10 +707,7 @@ contract FFIInterface is Test {
cmds[4] = vm.toString(memAddr); cmds[4] = vm.toString(memAddr);
cmds[5] = vm.toString(memVal); cmds[5] = vm.toString(memVal);
bytes memory result = vm.ffi(cmds); bytes memory result = vm.ffi(cmds);
( (bytes32 memRoot, bytes memory proof) = abi.decode(result, (bytes32, bytes));
bytes32 memRoot,
bytes memory proof
) = abi.decode(result, (bytes32, bytes));
return (memRoot, proof); return (memRoot, proof);
} }
} }
......
This diff is collapsed.
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