Fix solidity format

ethereum-optimism · Jan 16, 2025 · 7ae58de · 7ae58de
1 parent 190e945
commit 7ae58de
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 43 deletions.
diff --git a/rvsol/Makefile b/rvsol/Makefile
@@ -11,11 +11,11 @@ test:
 .PHONY: test
 
 lint-fix:
-	forge fmt
+	forge fmt ./**/*.sol
 .PHONY: lint-fix
 
 lint-check:
-	forge fmt && git diff --exit-code
+	forge fmt ./**/*.sol && git diff --exit-code
 .PHONY: lint-check
 
 fuzz-ffi:

diff --git a/rvsol/src/YulDeployer.sol b/rvsol/src/YulDeployer.sol
@@ -26,10 +26,7 @@ contract YulDeployer is Test {
             deployedAddress := create(0, add(bytecode, 0x20), mload(bytecode))
         }
 
-        require(
-            deployedAddress != address(0),
-            "YulDeployer could not deploy contract"
-        );
+        require(deployedAddress != address(0), "YulDeployer could not deploy contract");
 
         return deployedAddress;
     }

diff --git a/rvsol/test/Yul64Test.sol b/rvsol/test/Yul64Test.sol
@@ -2,9 +2,9 @@ pragma solidity 0.8.15;
 
 import "forge-std/Test.sol";
 import "../src/YulDeployer.sol";
-import {console} from "forge-std/console.sol";
+import { console } from "forge-std/console.sol";
 
-interface Yul64 {}
+interface Yul64 { }
 
 // Run with: forge test --match-path ./test/Yul64Test.sol -vvvvv
 contract Yul64Test is Test {
@@ -54,33 +54,43 @@ contract Yul64Test is Test {
     function testFuzz_parseTypeI(uint32 input) public {
         runDiffTest(slowFunctions[0], input);
     }
+
     function testFuzz_parseTypeS(uint32 input) public {
         runDiffTest(slowFunctions[1], input);
     }
+
     function testFuzz_parseTypeB(uint32 input) public {
         runDiffTest(slowFunctions[2], input);
     }
+
     function testFuzz_parseTypeU(uint32 input) public {
         runDiffTest(slowFunctions[3], input);
     }
+
     function testFuzz_parseTypeJ(uint32 input) public {
         runDiffTest(slowFunctions[4], input);
     }
+
     function testFuzz_parseOpcode(uint32 input) public {
         runDiffTest(slowFunctions[5], input);
     }
+
     function testFuzz_parseRd(uint32 input) public {
         runDiffTest(slowFunctions[6], input);
     }
+
     function testFuzz_parseFunct3(uint32 input) public {
         runDiffTest(slowFunctions[7], input);
     }
+
     function testFuzz_parseRs1(uint32 input) public {
         runDiffTest(slowFunctions[8], input);
     }
+
     function testFuzz_parseRs2(uint32 input) public {
         runDiffTest(slowFunctions[9], input);
     }
+
     function testFuzz_parseFunct7(uint32 input) public {
         runDiffTest(slowFunctions[10], input);
     }
@@ -92,10 +102,7 @@ contract Yul64Test is Test {
     /// @param funcToCall Defines function under test
     /// @param input Defines uint32 input to represent instruction
     function runDiffTest(string memory funcToCall, uint64 input) private {
-        (bool evmSuccess, bytes memory evmOutput) = executeEVM(
-            funcToCall,
-            input
-        );
+        (bool evmSuccess, bytes memory evmOutput) = executeEVM(funcToCall, input);
         bytes memory ffiOutput = executeFFI(funcToCall, input);
         assertConsistent(evmSuccess, evmOutput, ffiOutput);
     }
@@ -107,22 +114,20 @@ contract Yul64Test is Test {
     function executeEVM(
         string memory funcToCall,
         uint64 input
-    ) private returns (bool evmSuccess, bytes memory evmOutput) {
+    )
+        private
+        returns (bool evmSuccess, bytes memory evmOutput)
+    {
         // generate calldata for EVM call
-        bytes memory callDataBytes = abi.encodeWithSignature(
-            slowToEVM[funcToCall],
-            input
-        );
+        bytes memory callDataBytes = abi.encodeWithSignature(slowToEVM[funcToCall], input);
         (evmSuccess, evmOutput) = address(yul64).call(callDataBytes);
     }
     /// @notice Generates ffi command to invoke ./rvsol/test/slow with arguments
     /// @dev Required to build diff.go prior to use
     /// @param funcToCall key to slowToEVM mapping to define which function to test
     /// @param input Defines uint32 input to represent instruction
-    function executeFFI(
-        string memory funcToCall,
-        uint64 input
-    ) private returns (bytes memory ffiOutput) {
+
+    function executeFFI(string memory funcToCall, uint64 input) private returns (bytes memory ffiOutput) {
         string[] memory inputs = generateCommand(funcToCall, input);
         ffiOutput = vm.ffi(inputs);
     }
@@ -131,11 +136,7 @@ contract Yul64Test is Test {
     /// @param evmSuccess True if EVM call was successful (did not revert)
     /// @param evmOutput Result of EVM parse function
     /// @param ffiOutput Result of slow parse function
-    function assertConsistent(
-        bool evmSuccess,
-        bytes memory evmOutput,
-        bytes memory ffiOutput
-    ) private pure {
+    function assertConsistent(bool evmSuccess, bytes memory evmOutput, bytes memory ffiOutput) private pure {
         console.logBool(didPanic(ffiOutput));
         if (didPanic(ffiOutput)) {
             // if slow vm determined there was an invalid value
@@ -160,19 +161,14 @@ contract Yul64Test is Test {
     }
 
     /// @notice Generates ffi command to run slow.
-    /// @dev This requires slow to print nothing else when run except result. If changed, ensure script does not print with a newline
+    /// @dev This requires slow to print nothing else when run except result. If changed, ensure script does not print
+    /// with a newline
     /// @param functionToCall Defines function to call with ffi
     /// @param numberInput Specifies input from fuzzer to call with
     /// @return inputs list of strings with the full bash command to run ffi
-    function generateCommand(
-        string memory functionToCall,
-        uint64 numberInput
-    ) private pure returns (string[] memory) {
+    function generateCommand(string memory functionToCall, uint64 numberInput) private pure returns (string[] memory) {
         string memory bashCommand = string.concat(
-            "../rvgo/scripts/parse-diff-ffi/slow -fuzz=",
-            functionToCall,
-            " -number=",
-            (vm.toString(numberInput))
+            "../rvgo/scripts/parse-diff-ffi/slow -fuzz=", functionToCall, " -number=", (vm.toString(numberInput))
         );
         string[] memory inputs = new string[](3);
         inputs[0] = "bash";
@@ -182,13 +178,9 @@ contract Yul64Test is Test {
     }
 
     /// @notice Returns true if didPanic panic string
-    function didPanic(
-        bytes memory whatBytes
-    ) private pure returns (bool found) {
-        string
-            memory err = hex"70616E69633A20696E76616C69642076616C75650A0A676F726F7574696E652031205B72756E6E696E675D3A0A6D61696E2E6D61696E28290A";
-        return
-            keccak256(abi.encodePacked(string(whatBytes))) ==
-            keccak256(abi.encodePacked(err));
+    function didPanic(bytes memory whatBytes) private pure returns (bool found) {
+        string memory err =
+            hex"70616E69633A20696E76616C69642076616C75650A0A676F726F7574696E652031205B72756E6E696E675D3A0A6D61696E2E6D61696E28290A";
+        return keccak256(abi.encodePacked(string(whatBytes))) == keccak256(abi.encodePacked(err));
     }
 }