From c679bea7be0062f0581759d6789b0a450af47169 Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Thu, 21 Dec 2023 00:10:02 +0200
Subject: [PATCH] fix(cheatcodes): silence warnings for older Solidity versions
 (#6638)

---
 crates/cheatcodes/assets/cheatcodes.json | 4 ++--
 crates/cheatcodes/spec/src/vm.rs         | 4 ++--
 crates/cheatcodes/src/evm/fork.rs        | 4 ++--
 testdata/cheats/Vm.sol                   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/crates/cheatcodes/assets/cheatcodes.json b/crates/cheatcodes/assets/cheatcodes.json
index 927ebb78c20c..fceb5bcbf76e 100644
--- a/crates/cheatcodes/assets/cheatcodes.json
+++ b/crates/cheatcodes/assets/cheatcodes.json
@@ -1737,7 +1737,7 @@
       "func": {
         "id": "eth_getLogs",
         "description": "Gets all the logs according to specified filter.",
-        "declaration": "function eth_getLogs(uint256 fromBlock, uint256 toBlock, address addr, bytes32[] memory topics) external returns (EthGetLogs[] memory logs);",
+        "declaration": "function eth_getLogs(uint256 fromBlock, uint256 toBlock, address target, bytes32[] memory topics) external returns (EthGetLogs[] memory logs);",
         "visibility": "external",
         "mutability": "",
         "signature": "eth_getLogs(uint256,uint256,address,bytes32[])",
@@ -4397,7 +4397,7 @@
       "func": {
         "id": "stopAndReturnStateDiff",
         "description": "Returns an ordered array of all account accesses from a `vm.startStateDiffRecording` session.",
-        "declaration": "function stopAndReturnStateDiff() external returns (AccountAccess[] memory accesses);",
+        "declaration": "function stopAndReturnStateDiff() external returns (AccountAccess[] memory accountAccesses);",
         "visibility": "external",
         "mutability": "",
         "signature": "stopAndReturnStateDiff()",
diff --git a/crates/cheatcodes/spec/src/vm.rs b/crates/cheatcodes/spec/src/vm.rs
index ae6622842fae..907dce1dc366 100644
--- a/crates/cheatcodes/spec/src/vm.rs
+++ b/crates/cheatcodes/spec/src/vm.rs
@@ -260,7 +260,7 @@ interface Vm {
 
     /// Returns an ordered array of all account accesses from a `vm.startStateDiffRecording` session.
     #[cheatcode(group = Evm, safety = Safe)]
-    function stopAndReturnStateDiff() external returns (AccountAccess[] memory accesses);
+    function stopAndReturnStateDiff() external returns (AccountAccess[] memory accountAccesses);
 
     // -------- Recording Map Writes --------
 
@@ -508,7 +508,7 @@ interface Vm {
 
     /// Gets all the logs according to specified filter.
     #[cheatcode(group = Evm, safety = Safe)]
-    function eth_getLogs(uint256 fromBlock, uint256 toBlock, address addr, bytes32[] memory topics)
+    function eth_getLogs(uint256 fromBlock, uint256 toBlock, address target, bytes32[] memory topics)
         external
         returns (EthGetLogs[] memory logs);
 
diff --git a/crates/cheatcodes/src/evm/fork.rs b/crates/cheatcodes/src/evm/fork.rs
index f246d264c4dc..57683a76003b 100644
--- a/crates/cheatcodes/src/evm/fork.rs
+++ b/crates/cheatcodes/src/evm/fork.rs
@@ -239,7 +239,7 @@ impl Cheatcode for rpcCall {
 
 impl Cheatcode for eth_getLogsCall {
     fn apply_full<DB: DatabaseExt>(&self, ccx: &mut CheatsCtxt<DB>) -> Result {
-        let Self { fromBlock, toBlock, addr, topics } = self;
+        let Self { fromBlock, toBlock, target, topics } = self;
         let (Ok(from_block), Ok(to_block)) = (u64::try_from(fromBlock), u64::try_from(toBlock))
         else {
             bail!("blocks in block range must be less than 2^64 - 1")
@@ -253,7 +253,7 @@ impl Cheatcode for eth_getLogsCall {
             ccx.data.db.active_fork_url().ok_or_else(|| fmt_err!("no active fork URL found"))?;
         let provider = ProviderBuilder::new(&url).build()?;
         let mut filter =
-            Filter::new().address(addr.to_ethers()).from_block(from_block).to_block(to_block);
+            Filter::new().address(target.to_ethers()).from_block(from_block).to_block(to_block);
         for (i, topic) in topics.iter().enumerate() {
             let topic = topic.to_ethers();
             match i {
diff --git a/testdata/cheats/Vm.sol b/testdata/cheats/Vm.sol
index a8c885f6e352..aeea7cdaf43e 100644
--- a/testdata/cheats/Vm.sol
+++ b/testdata/cheats/Vm.sol
@@ -84,7 +84,7 @@ interface Vm {
     function envUint(string calldata name) external view returns (uint256 value);
     function envUint(string calldata name, string calldata delim) external view returns (uint256[] memory value);
     function etch(address target, bytes calldata newRuntimeBytecode) external;
-    function eth_getLogs(uint256 fromBlock, uint256 toBlock, address addr, bytes32[] memory topics) external returns (EthGetLogs[] memory logs);
+    function eth_getLogs(uint256 fromBlock, uint256 toBlock, address target, bytes32[] memory topics) external returns (EthGetLogs[] memory logs);
     function exists(string calldata path) external returns (bool result);
     function expectCallMinGas(address callee, uint256 msgValue, uint64 minGas, bytes calldata data) external;
     function expectCallMinGas(address callee, uint256 msgValue, uint64 minGas, bytes calldata data, uint64 count) external;
@@ -217,7 +217,7 @@ interface Vm {
     function startPrank(address msgSender) external;
     function startPrank(address msgSender, address txOrigin) external;
     function startStateDiffRecording() external;
-    function stopAndReturnStateDiff() external returns (AccountAccess[] memory accesses);
+    function stopAndReturnStateDiff() external returns (AccountAccess[] memory accountAccesses);
     function stopBroadcast() external;
     function stopMappingRecording() external;
     function stopPrank() external;