From 7614dd15b69706b7660eaed5eaa150cd4051b968 Mon Sep 17 00:00:00 2001 From: Nikita Lebedev Date: Fri, 20 Sep 2024 13:02:32 +0300 Subject: [PATCH] Merge develop & MerkleSchemaRegistryTest fix Signed-off-by: Nikita Lebedev --- .../hedera/node/app/state/merkle/MerkleSchemaRegistryTest.java | 2 ++ .../com/swirlds/merkledb/files/DataFileReaderCloseTest.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/state/merkle/MerkleSchemaRegistryTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/state/merkle/MerkleSchemaRegistryTest.java index 36637e52a15..4e6a64cedf2 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/state/merkle/MerkleSchemaRegistryTest.java +++ b/hedera-node/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/platform-sdk/swirlds-merkledb/src/test/java/com/swirlds/merkledb/files/DataFileReaderCloseTest.java b/platform-sdk/swirlds-merkledb/src/test/java/com/swirlds/merkledb/files/DataFileReaderCloseTest.java index 595d0b14c9a..29ee3ac4fe2 100644 --- a/platform-sdk/swirlds-merkledb/src/test/java/com/swirlds/merkledb/files/DataFileReaderCloseTest.java +++ b/platform-sdk/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;