chore: remove block data from the repo (#843)

Signed-off-by: Alex Kehayov <[email protected]>

Author: AlexKehayov

simulator/build.gradle.kts

@@ -72,15 +72,6 @@ tasks.register<JavaExec>("runConsumer") {
     environment("PROMETHEUS_ENDPOINT_PORT_NUMBER", "9997")
 }
 
-tasks.register<Sync>("untarTestBlockStream") {
-    description = "Untar the test block stream data"
-
-    from(tarTree(resources.gzip(file("src/main/resources/block-0.0.3.tar.gz"))))
-    into(layout.buildDirectory.dir("extracted-resources"))
-}
-
-sourceSets.main { resources.srcDir(tasks.named("untarTestBlockStream")) }
-
 // Vals
 val dockerProjectRootDirectory: Directory = layout.projectDirectory.dir("docker")
 var resourcesProjectRootDirectory: Directory = layout.projectDirectory.dir("src/main/resources")

simulator/docker/Dockerfile

@@ -14,20 +14,11 @@ COPY simulator-*.tar ./simulator.tar
 RUN mkdir -p /app/logs/config
 COPY logging.properties /app/logs/config/logging.properties
 
-# Create resources directory and copy block data
-RUN mkdir -p src/main/resources
-COPY block-0.0.3.tar.gz src/main/resources/
-
 # Extract the distribution and block data
 RUN tar -xf simulator.tar && \
     rm simulator.tar && \
-    cd src/main/resources && \
-    tar -xzf block-0.0.3.tar.gz && \
-    rm block-0.0.3.tar.gz && \
-    cd /app
-
-RUN mkdir -p /opt/simulator/data
-RUN chown -R $UID:$GID /app /opt/simulator/data
+    cd /app && \
+    chown -R $UID:$GID /app
 
 # Switch to non-root user
 USER $UNAME

simulator/src/main/java/org/hiero/block/simulator/config/data/BlockGeneratorConfig.java

@@ -6,7 +6,7 @@
 import com.swirlds.config.api.validation.annotation.Min;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
+import org.hiero.block.common.utils.StringUtilities;
 import org.hiero.block.simulator.config.logging.Loggable;
 import org.hiero.block.simulator.config.types.GenerationMode;
 
@@ -44,23 +44,27 @@ public record BlockGeneratorConfig(
      * @throws IllegalArgumentException if the folder root path is not absolute or the folder does not exist
      */
     public BlockGeneratorConfig {
-        // Verify folderRootPath property
-        Path path = Path.of(folderRootPath);
+        // Default generation mode is CRAFT.
+        // If set to DIR, block files must be located in a directory on the file system.
+        // Set location at app.properties
+        if (generationMode == GenerationMode.DIR) {
+            // Verify folderRootPath property
+            // Check if not empty
+            if (StringUtilities.isBlank(folderRootPath)) {
+                throw new IllegalArgumentException("Root path is not provided");
+            }
+            Path path = Path.of(folderRootPath);
+            // Check if absolute
+            if (!path.isAbsolute()) {
+                throw new IllegalArgumentException(folderRootPath + " Root path must be absolute");
+            }
+            // Check if the folder exists
+            if (Files.notExists(path)) {
+                throw new IllegalArgumentException("Folder does not exist: " + path);
+            }
 
-        // If folderRootPath is empty, set it to the default data directory
-        if (folderRootPath.isEmpty()) {
-            path = Paths.get("").toAbsolutePath().resolve("build/resources/main//block-0.0.3");
+            folderRootPath = path.toString();
         }
-        // Check if absolute
-        if (!path.isAbsolute()) {
-            throw new IllegalArgumentException(folderRootPath + " Root path must be absolute");
-        }
-        // Check if the folder exists
-        if (Files.notExists(path) && generationMode == GenerationMode.DIR) {
-            throw new IllegalArgumentException("Folder does not exist: " + path);
-        }
-
-        folderRootPath = path.toString();
 
         if (endBlockNumber > -1 && endBlockNumber < startBlockNumber) {
             throw new IllegalArgumentException("endBlockNumber must be greater than or equal to startBlockNumber");

simulator/src/main/resources/block-0.0.3.tar.gz

@@ -156,7 +156,7 @@ void start_constantRateStreaming() throws InterruptedException, BlockSimulatorPa
                 "generator.managerImplementation",
                 "BlockAsFileLargeDataSets",
                 "generator.rootPath",
-                getAbsoluteFolder("build/resources/test//block-0.0.3-blk/"),
+                getAbsoluteFolder("build/resources/test/block-0.0.3-blk/"),
                 "blockStream.streamingMode",
                 "CONSTANT_RATE",
                 "blockStream.blockItemsBatchSize",
@@ -242,7 +242,7 @@ void start_millisPerBlockStreaming() throws InterruptedException, IOException, B
                 "generator.managerImplementation",
                 "BlockAsFileLargeDataSets",
                 "generator.rootPath",
-                getAbsoluteFolder("build/resources/test//block-0.0.3-blk/"),
+                getAbsoluteFolder("build/resources/test/block-0.0.3-blk/"),
                 "blockStream.streamingMode",
                 "MILLIS_PER_BLOCK"));
 
@@ -286,7 +286,7 @@ void start_millisPerSecond_streamingLagVerifyWarnLog()
                 "generator.managerImplementation",
                 "BlockAsFileBlockStreamManager",
                 "generator.rootPath",
-                getAbsoluteFolder("build/resources/test//block-0.0.3-blk/"),
+                getAbsoluteFolder("build/resources/test/block-0.0.3-blk/"),
                 "blockStream.maxBlockItemsToStream",
                 "2",
                 "blockStream.streamingMode",

simulator/src/test/java/org/hiero/block/simulator/BlockStreamSimulatorTest.java

@@ -11,6 +11,7 @@
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Map;
 
 public class TestUtils {
@@ -48,4 +49,8 @@ public static int findFreePort() throws IOException {
             return socket.getLocalPort();
         }
     }
+
+    public static String getAbsoluteFolder(@NonNull String relativePath) {
+        return Paths.get(relativePath).toAbsolutePath().toString();
+    }
 }

simulator/src/test/java/org/hiero/block/simulator/TestUtils.java

@@ -33,7 +33,7 @@ private BlockStreamConfig.Builder getBlockStreamConfigBuilder() {
     }
 
     private BlockGeneratorConfig.Builder getBlockGeneratorConfigBuilder() {
-        String folderRootPath = "build/resources/main//block-0.0.3/";
+        String folderRootPath = "build/resources/test/block-0.0.3-blk/";
         GenerationMode generationMode = GenerationMode.DIR;
 
         String blockStreamManagerImplementation = "BlockAsFileBlockStreamManager";
@@ -85,7 +85,7 @@ void testLastKnownStatusesCapacity() {
     @Test
     void testValidAbsolutePath() {
         // Setup valid folder path and generation mode
-        String gzRootFolder = "build/resources/main//block-0.0.3/";
+        String gzRootFolder = "build/resources/test/block-0.0.3-blk/";
         String folderRootPath = getAbsoluteFolder(gzRootFolder);
         GenerationMode generationMode = GenerationMode.DIR;
 
@@ -108,15 +108,15 @@ void testEmptyFolderRootPath() {
         // Setup empty folder root path and generation mode
         String folderRootPath = "";
         GenerationMode generationMode = GenerationMode.DIR;
-        BlockGeneratorConfig.Builder builder =
-                getBlockGeneratorConfigBuilder().folderRootPath(folderRootPath).generationMode(generationMode);
 
-        BlockGeneratorConfig config = builder.build();
+        // Verify that an exception is thrown
+        IllegalArgumentException exception =
+                assertThrows(IllegalArgumentException.class, () -> getBlockGeneratorConfigBuilder()
+                        .folderRootPath(folderRootPath)
+                        .generationMode(generationMode)
+                        .build());
 
-        // Verify that the path is set to the default
-        Path expectedPath = Paths.get("build/resources/main//block-0.0.3/").toAbsolutePath();
-        assertEquals(expectedPath.toString(), config.folderRootPath());
-        assertEquals(GenerationMode.DIR, config.generationMode());
+        assertEquals("Root path is not provided", exception.getMessage());
     }
 
     @Test

simulator/src/test/java/org/hiero/block/simulator/config/data/BlockStreamConfigTest.java

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.hiero.block.simulator.generator;
 
+import static org.hiero.block.simulator.TestUtils.getAbsoluteFolder;
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.IOException;
-import java.nio.file.Paths;
 import org.hiero.block.simulator.config.data.BlockGeneratorConfig;
 import org.hiero.block.simulator.config.types.GenerationMode;
 import org.hiero.block.simulator.exception.BlockSimulatorParsingException;
@@ -13,13 +13,9 @@
 
 class BlockAsFileBlockStreamManagerTest {
 
-    private final String gzRootFolder = "build/resources/main//block-0.0.3/";
+    private final String gzRootFolder = "build/resources/test/block-0.0.3-blk/";
     private BlockStreamManager blockStreamManager;
 
-    private String getAbsoluteFolder(String relativePath) {
-        return Paths.get(relativePath).toAbsolutePath().toString();
-    }
-
     @BeforeEach
     void setUp() {
         blockStreamManager = getBlockAsFileBlockStreamManager(getAbsoluteFolder(gzRootFolder));
@@ -40,14 +36,15 @@ void getNextBlock() throws IOException, BlockSimulatorParsingException {
 
     @Test
     void getNextBlockItem() throws IOException, BlockSimulatorParsingException {
-        for (int i = 0; i < 35000; i++) {
+        // iterates the block items of the blocks in gzRootFolder
+        for (int i = 0; i < 72; i++) {
             assertNotNull(blockStreamManager.getNextBlockItem());
         }
     }
 
     @Test
     void loadBlockBlk() throws IOException, BlockSimulatorParsingException {
-        String blkRootFolder = "build/resources/test//block-0.0.3-blk/";
+        String blkRootFolder = "build/resources/test/block-0.0.3-blk/";
         BlockStreamManager blockStreamManager = getBlockAsFileBlockStreamManager(getAbsoluteFolder(blkRootFolder));
         blockStreamManager.init();
 
@@ -59,7 +56,7 @@ void BlockAsFileBlockStreamManagerInvalidRootPath() {
         assertThrows(
                 RuntimeException.class,
                 () -> getBlockAsFileBlockStreamManager(
-                        getAbsoluteFolder("build/resources/test//BlockAsDirException/1/")));
+                        getAbsoluteFolder("build/resources/test/BlockAsDirException/1/")));
     }
 
     private BlockStreamManager getBlockAsFileBlockStreamManager(String rootFolder) {

simulator/src/test/java/org/hiero/block/simulator/generator/BlockAsFileBlockStreamManagerTest.java

@@ -22,7 +22,7 @@
 
 class BlockAsFileLargeDataSetsTest {
 
-    private static final String rootFolder = "build/resources/test//block-0.0.3-blk/";
+    private static final String rootFolder = "build/resources/test/block-0.0.3-blk/";
     private static int filesInFolder;
 
     @BeforeAll

simulator/src/test/java/org/hiero/block/simulator/generator/BlockAsFileLargeDataSetsTest.java

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.hiero.block.simulator.generator;
 
+import static org.hiero.block.simulator.TestUtils.getAbsoluteFolder;
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.IOException;
@@ -32,7 +33,9 @@ void providesBlockStreamManager_AsFileLargeDataSets() throws IOException {
                         "generator.generationMode",
                         "DIR",
                         "generator.managerImplementation",
-                        "BlockAsFileLargeDataSets"))
+                        "BlockAsFileLargeDataSets",
+                        "generator.folderRootPath",
+                        getAbsoluteFolder("build/resources/test/block-0.0.3-blk/")))
                 .getConfigData(BlockGeneratorConfig.class);
 
         final BlockStreamManager blockStreamManager = GeneratorInjectionModule.providesBlockStreamManager(
@@ -49,7 +52,7 @@ void providesBlockStreamManager_AsFile() throws IOException {
                         "generator.managerImplementation",
                         "BlockAsFileBlockStreamManager",
                         "generator.folderRootPath",
-                        ""))
+                        getAbsoluteFolder("build/resources/test/block-0.0.3-blk/")))
                 .getConfigData(BlockGeneratorConfig.class);
 
         final BlockStreamManager blockStreamManager = GeneratorInjectionModule.providesBlockStreamManager(
@@ -66,7 +69,7 @@ void providesBlockStreamManager_default() throws IOException {
                         "generator.managerImplementation",
                         "",
                         "generator.folderRootPath",
-                        ""))
+                        getAbsoluteFolder("build/resources/test/block-0.0.3-blk/")))
                 .getConfigData(BlockGeneratorConfig.class);
 
         final BlockStreamManager blockStreamManager = GeneratorInjectionModule.providesBlockStreamManager(