Merge pull request #9 from fxhash/feat/reuse-enum-for-type

feat: use enum for type in checksum
fxhash · Nov 29, 2023 · 449906f · 449906f
2 parents 9178614 + 25e4934
commit 449906f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/src/FileSystem.sol b/src/FileSystem.sol
@@ -54,7 +54,7 @@ contract FileSystem is IFileSystem {
         bytes32[] memory hashedFilenames = hashFileNames(_fileNames);
         directoryChecksum = keccak256(
             bytes.concat(
-                DIRECTORY_TYPE,
+                bytes1(uint8(InodeType.Directory)),
                 keccak256(abi.encodePacked(hashedFilenames)),
                 keccak256(abi.encodePacked(_fileChecksums))
             )
@@ -76,7 +76,11 @@ contract FileSystem is IFileSystem {
             if (!IContentStore(CONTENT_STORE).checksumExists(_chunkPointers[i])) revert ChunkNotFound();
         }
         fileChecksum = keccak256(
-            bytes.concat(FILE_TYPE, keccak256(abi.encodePacked(_chunkPointers)), keccak256(_metadata))
+            bytes.concat(
+                bytes1(uint8(InodeType.File)),
+                keccak256(abi.encodePacked(_chunkPointers)),
+                keccak256(_metadata)
+            )
         );
         if (inodeExists(fileChecksum)) revert InodeAlreadyExists();
         File memory newFile = File(_metadata, _chunkPointers);

diff --git a/src/utils/Constants.sol b/src/utils/Constants.sol
@@ -5,10 +5,6 @@ pragma solidity 0.8.23;
                                 CONSTANTS
 //////////////////////////////////////////////////////////////////////////*/
 
-// Metadata
-bytes1 constant DIRECTORY_TYPE = bytes1(0x01);
-bytes1 constant FILE_TYPE = bytes1(0x00);
-
 // Characters
 uint256 constant CHARACTER_LENGTH = 18;
 string constant FORBIDDEN_CHARS = ":/?#[]@!$&'()*+,;=";
diff --git a/test/FileSystem/CreateDirectory.sol b/test/FileSystem/CreateDirectory.sol
@@ -21,7 +21,7 @@ contract CreateDirectory is FileSystemTest {
         hashedNames = fileSystem.hashFileNames(fileNames);
         checksum = keccak256(
             abi.encodePacked(
-                DIRECTORY_TYPE,
+                bytes1(uint8(InodeType.Directory)),
                 keccak256(abi.encodePacked(hashedNames)),
                 keccak256(abi.encodePacked(filePointers))
             )

diff --git a/test/FileSystem/CreateFile.t.sol b/test/FileSystem/CreateFile.t.sol
@@ -19,7 +19,11 @@ contract CreateFile is FileSystemTest {
     function test_CreateFile() public {
         fileSystem.createFile(metadata, chunkChecksums);
         checksum = keccak256(
-            abi.encodePacked(FILE_TYPE, keccak256(abi.encodePacked(chunkChecksums)), keccak256(metadata))
+            abi.encodePacked(
+                bytes1(uint8(InodeType.File)),
+                keccak256(abi.encodePacked(chunkChecksums)),
+                keccak256(metadata)
+            )
         );
         assertTrue(fileSystem.inodeExists(checksum));
     }
@@ -53,7 +57,11 @@ contract CreateFile is FileSystemTest {
         chunkChecksums.push(chunkChecksums[0]);
         fileSystem.createFile(metadata, chunkChecksums);
         checksum = keccak256(
-            abi.encodePacked(FILE_TYPE, keccak256(abi.encodePacked(chunkChecksums)), keccak256(metadata))
+            abi.encodePacked(
+                bytes1(uint8(InodeType.File)),
+                keccak256(abi.encodePacked(chunkChecksums)),
+                keccak256(metadata)
+            )
         );
         assertTrue(fileSystem.inodeExists(checksum));
     }

diff --git a/test/FileSystem/FileSystemTest.t.sol b/test/FileSystem/FileSystemTest.t.sol
@@ -5,7 +5,7 @@ import "forge-std/Test.sol";
 import "src/utils/Constants.sol";
 
 import {ContentStore} from "ethfs/packages/contracts/src/ContentStore.sol";
-import {FileSystem} from "src/FileSystem.sol";
+import {FileSystem, InodeType} from "src/FileSystem.sol";
 import {BytesLib} from "test/utils/BytesLib.sol";
 
 import {IContentStore} from "ethfs/packages/contracts/src/IContentStore.sol";

diff --git a/test/FileSystem/ReadDirectory.t.sol b/test/FileSystem/ReadDirectory.t.sol
@@ -21,7 +21,7 @@ contract ReadDirectory is FileSystemTest {
         hashedFileNames = fileSystem.hashFileNames(fileNames);
         checksum = keccak256(
             abi.encodePacked(
-                DIRECTORY_TYPE,
+                bytes1(uint8(InodeType.Directory)),
                 keccak256(abi.encodePacked(hashedFileNames)),
                 keccak256(abi.encodePacked(filePointers))
             )