Merge pull request #114 from ethstorage/kill_warns

Fix warnings
ethstorage · Oct 12, 2024 · 648e477 · 648e477
2 parents 0d52b2c + e62ce72
commit 648e477
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 35 deletions.
diff --git a/contracts/test/EthStorageContractTest.t.sol b/contracts/test/EthStorageContractTest.t.sol
@@ -3,8 +3,6 @@ pragma solidity ^0.8.19;
 
 import "./TestEthStorageContract.sol";
 import "forge-std/Test.sol";
-import "forge-std/Vm.sol";
-import "forge-std/console.sol";
 import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
 contract EthStorageContractTest is Test {

diff --git a/contracts/test/StorageContractTest.t.sol b/contracts/test/StorageContractTest.t.sol
@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.19;
 
-import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 import "./TestStorageContract.sol";
 import "../StorageContract.sol";
 import "forge-std/Test.sol";
-import "forge-std/Vm.sol";
 
 contract StorageContractTest is Test {
     uint256 constant STORAGE_COST = 10000000;
@@ -172,7 +170,7 @@ contract Attacker is Test {
         storageContract = _storageContract;
     }
 
-    fallback() external payable {
+    receive() external payable {
         uint256 _shardId = 0;
         uint256 _nonce = 0;
         bytes32[] memory _encodedSamples = new bytes32[](0);

diff --git a/contracts/test/TestDecentralizedKV.sol b/contracts/test/TestDecentralizedKV.sol
@@ -39,7 +39,7 @@ contract TestDecentralizedKV is DecentralizedKV {
         dataMap[kvIndices[0]] = data;
     }
 
-    function get(bytes32 key, DecodeType decodeType, uint256 off, uint256 len)
+    function get(bytes32 key, DecodeType, /* decodeType */ uint256 off, uint256 len)
         public
         view
         override

diff --git a/contracts/test/TestEthStorageContract.sol b/contracts/test/TestEthStorageContract.sol
@@ -36,7 +36,7 @@ contract TestEthStorageContract is EthStorageContract {
         _putBatchInternal(keys, dataHashes, lengths);
     }
 
-    function putBlob(bytes32 _key, uint256 _blobIdx, uint256 _length) public payable override {
+    function putBlob(bytes32 _key, uint256, /* _blobIdx */ uint256 _length) public payable override {
         bytes32 dataHash = bytes32(uint256(1 << 8 * 8));
         require(dataHash != 0, "EthStorageContract: failed to get blob hash");
 
@@ -194,7 +194,7 @@ contract TestEthStorageContract is EthStorageContract {
         require(nonce < nonceLimit, "nonce too big");
 
         // Check if the data matches the hash in metadata and obtain the solution hash.
-        bytes32 hash0 = verifySamples(shardId, initHash0, miner, encodedSamples, masks, inclusiveProofs, decodeProof);
+        verifySamples(shardId, initHash0, miner, encodedSamples, masks, inclusiveProofs, decodeProof);
 
         uint256 diff = _calculateDiffAndInitHashSingleShard(shardId, mineTs);
 

diff --git a/contracts/test/TestMerkleLib.sol b/contracts/test/TestMerkleLib.sol
@@ -12,29 +12,27 @@ contract TestMerkleLib {
         return MerkleLib.merkleRootWithMinTree(data, chunkSize);
     }
 
-    function merkleRootNoView(bytes memory data, uint256 chunkSize, uint256 nChunkBits) public returns (bytes32) {
+    function merkleRootNoView(bytes memory data, uint256 chunkSize, uint256 nChunkBits) public pure returns (bytes32) {
         return MerkleLib.merkleRoot(data, chunkSize, nChunkBits);
     }
 
-    function keccak256NoView(bytes memory data) public returns (bytes32) {
+    function keccak256NoView(bytes memory data) public pure returns (bytes32) {
         return keccak256(data);
     }
 
-    function verify(
-        bytes memory chunkData,
-        uint256 chunkIdx,
-        bytes32 root,
-        bytes32[] memory proofs
-    ) public pure returns (bool) {
+    function verify(bytes memory chunkData, uint256 chunkIdx, bytes32 root, bytes32[] memory proofs)
+        public
+        pure
+        returns (bool)
+    {
         return MerkleLib.verify(keccak256(chunkData), chunkIdx, root, proofs);
     }
 
-    function getProof(
-        bytes memory data,
-        uint256 chunkSize,
-        uint256 nChunkBits,
-        uint256 chunkIdx
-    ) public pure returns (bytes32[] memory) {
+    function getProof(bytes memory data, uint256 chunkSize, uint256 nChunkBits, uint256 chunkIdx)
+        public
+        pure
+        returns (bytes32[] memory)
+    {
         return MerkleLib.getProof(data, chunkSize, nChunkBits, chunkIdx);
     }
 

diff --git a/contracts/test/TestStorageContract.sol b/contracts/test/TestStorageContract.sol
@@ -19,13 +19,13 @@ contract TestStorageContract is StorageContract {
     }
 
     function verifySamples(
-        uint256 _startShardId,
-        bytes32 _hash0,
-        address _miner,
-        bytes32[] memory _encodedSamples,
-        uint256[] memory _masks,
-        bytes[] calldata _inclusiveProofs,
-        bytes[] calldata _decodeProof
+        uint256, /* _startShardId */
+        bytes32, /* _hash0 */
+        address, /* _miner */
+        bytes32[] memory, /* _encodedSamples */
+        uint256[] memory, /* _masks */
+        bytes[] calldata, /* _inclusiveProofs */
+        bytes[] calldata /* _decodeProof */
     ) public pure override returns (bytes32) {
         return bytes32(0);
     }
@@ -50,12 +50,12 @@ contract TestStorageContract is StorageContract {
         uint256 _blockNum,
         uint256 _shardId,
         address _miner,
-        uint256 _nonce,
-        bytes32[] memory _encodedSamples,
-        uint256[] memory _masks,
-        bytes calldata _randaoProof,
-        bytes[] calldata _inclusiveProofs,
-        bytes[] calldata _decodeProof
+        uint256, /* _nonce */
+        bytes32[] memory, /* _encodedSamples */
+        uint256[] memory, /* _masks */
+        bytes calldata, /* _randaoProof */
+        bytes[] calldata, /* _inclusiveProofs */
+        bytes[] calldata /* _decodeProof */
     ) internal override {
         uint256 mineTs = _getMinedTs(_blockNum);
         _rewardMiner(_shardId, _miner, mineTs, 1);