Merge develop & MerkleSchemaRegistryTest fix

Signed-off-by: Nikita Lebedev <nikita.lebedev@limechain.tech>
hashgraph · Sep 20, 2024 · 7614dd1 · 7614dd1
1 parent a7d0685
commit 7614dd1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...e/hedera-app/src/test/java/com/hedera/node/app/state/merkle/MerkleSchemaRegistryTest.java b/...e/hedera-app/src/test/java/com/hedera/node/app/state/merkle/MerkleSchemaRegistryTest.java
@@ -92,6 +92,8 @@ void setUp() {
         lenient().when(config.getConfigData(MerkleDbConfig.class)).thenReturn(merkleDbConfig);
         final var vmConfig = mock(VirtualMapConfig.class);
         lenient().when(config.getConfigData(VirtualMapConfig.class)).thenReturn(vmConfig);
+        lenient().when(vmConfig.maximumVirtualMapSize()).thenReturn(Long.valueOf(Integer.MAX_VALUE));
+
         final var temporaryFileDbConfig = mock(TemporaryFileConfig.class);
         lenient().when(config.getConfigData(TemporaryFileConfig.class)).thenReturn(temporaryFileDbConfig);
         final var stateCommonConfig = mock(StateCommonConfig.class);

diff --git a/...dk/swirlds-merkledb/src/test/java/com/swirlds/merkledb/files/DataFileReaderCloseTest.java b/...dk/swirlds-merkledb/src/test/java/com/swirlds/merkledb/files/DataFileReaderCloseTest.java
@@ -113,7 +113,7 @@ void readerIsOpenTest() throws Exception {
     @Test
     void readWhileFinishWritingTest() throws IOException {
         final Path tmpDir = LegacyTemporaryFileBuilder.buildTemporaryDirectory("readWhileFinishWritingTest", config());
-        final MerkleDbConfig dbConfig = ConfigurationHolder.getConfigData(MerkleDbConfig.class);
+        final MerkleDbConfig dbConfig = config().getConfigData(MerkleDbConfig.class);
         for (int i = 0; i < 100; i++) {
             Path filePath = null;
             final int fi = i;