Skip to content

Commit 2528d68

Browse files
AlfredoG87AlfredoG87
authored
build(deps): Upgrade Swirlds dependency to 0.59.2 (#761)
Signed-off-by: Alfredo Gutierrez Grajeda <[email protected]>
1 parent 3236bb9 commit 2528d68

File tree

8 files changed

+35
-472
lines changed

8 files changed

+35
-472
lines changed

‎hiero-dependency-versions/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies.constraints {
1414
val helidonVersion = "4.1.6"
1515
val pbjVersion = "0.9.17"
1616
val protobufVersion = "4.29.3"
17-
val swirldsVersion = "0.58.4"
17+
val swirldsVersion = "0.59.2"
1818

1919
api("com.github.luben:zstd-jni:1.5.7-1") { because("com.github.luben.zstd_jni") }
2020
api("com.github.spotbugs:spotbugs-annotations:4.9.2") {

‎server/src/test/java/com/hedera/block/server/config/TestConfigBuilder.java

Lines changed: 0 additions & 223 deletions
This file was deleted.

‎server/src/test/java/com/hedera/block/server/config/logging/ConfigurationLoggingImplTest.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import static org.junit.jupiter.api.Assertions.assertNotNull;
66
import static org.junit.jupiter.api.Assertions.fail;
77

8-
import com.hedera.block.server.config.TestConfigBuilder;
98
import com.hedera.block.server.consumer.ConsumerConfig;
109
import com.swirlds.config.api.Configuration;
10+
import com.swirlds.config.api.ConfigurationBuilder;
1111
import com.swirlds.config.extensions.sources.ClasspathFileConfigSource;
1212
import edu.umd.cs.findbugs.annotations.NonNull;
1313
import java.io.IOException;
@@ -59,8 +59,9 @@ public void testMaxLineLength() {
5959
private static Configuration getTestConfig(@NonNull Map<String, String> customProperties) throws IOException {
6060

6161
// create test configuration
62-
TestConfigBuilder testConfigBuilder =
63-
new TestConfigBuilder(true).withSource(new ClasspathFileConfigSource(Path.of("app.properties")));
62+
ConfigurationBuilder testConfigBuilder = ConfigurationBuilder.create()
63+
.autoDiscoverExtensions()
64+
.withSource(new ClasspathFileConfigSource(Path.of("app.properties")));
6465

6566
for (Map.Entry<String, String> entry : customProperties.entrySet()) {
6667
String key = entry.getKey();
@@ -69,14 +70,15 @@ private static Configuration getTestConfig(@NonNull Map<String, String> customPr
6970
}
7071

7172
testConfigBuilder = testConfigBuilder.withConfigDataType(ConsumerConfig.class);
72-
return testConfigBuilder.getOrCreateConfig();
73+
return testConfigBuilder.build();
7374
}
7475

7576
private static Configuration getTestConfigWithSecret() throws IOException {
7677

77-
TestConfigBuilder testConfigBuilder =
78-
new TestConfigBuilder(true).withSource(new ClasspathFileConfigSource(Path.of("app.properties")));
78+
ConfigurationBuilder testConfigBuilder = ConfigurationBuilder.create()
79+
.autoDiscoverExtensions()
80+
.withSource(new ClasspathFileConfigSource(Path.of("app.properties")));
7981
testConfigBuilder = testConfigBuilder.withConfigDataType(TestSecretConfig.class);
80-
return testConfigBuilder.getOrCreateConfig();
82+
return testConfigBuilder.build();
8183
}
8284
}

‎server/src/test/java/com/hedera/block/server/persistence/StreamPersistenceHandlerImplTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
import com.hedera.block.server.ack.AckHandler;
1414
import com.hedera.block.server.config.BlockNodeContext;
15-
import com.hedera.block.server.config.TestConfigBuilder;
1615
import com.hedera.block.server.events.ObjectEvent;
1716
import com.hedera.block.server.mediator.SubscriptionHandler;
1817
import com.hedera.block.server.metrics.MetricsService;
@@ -23,6 +22,7 @@
2322
import com.hedera.block.server.service.ServiceStatus;
2423
import com.hedera.hapi.block.BlockItemUnparsed;
2524
import com.swirlds.config.api.Configuration;
25+
import com.swirlds.config.api.ConfigurationBuilder;
2626
import java.io.IOException;
2727
import java.nio.file.Path;
2828
import java.util.List;
@@ -70,10 +70,10 @@ class StreamPersistenceHandlerImplTest {
7070

7171
@BeforeEach
7272
void setUp() {
73-
final TestConfigBuilder configBuilder = new TestConfigBuilder(PersistenceStorageConfig.class);
73+
final ConfigurationBuilder configBuilder = ConfigurationBuilder.create().autoDiscoverExtensions();
7474
configBuilder.withValue(PERSISTENCE_STORAGE_LIVE_ROOT_PATH_KEY, testTempDir.toString());
7575
configBuilder.withValue(PERSISTENCE_STORAGE_ARCHIVE_ROOT_PATH_KEY, testTempDir.toString());
76-
final Configuration config = configBuilder.getOrCreateConfig();
76+
final Configuration config = configBuilder.build();
7777
persistenceStorageConfig = config.getConfigData(PersistenceStorageConfig.class);
7878
}
7979

‎server/src/test/java/com/hedera/block/server/persistence/storage/archive/LocalGroupZipArchiveTaskTest.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import static org.assertj.core.api.Assertions.assertThatIOException;
1010

1111
import com.hedera.block.common.utils.FileUtilities;
12-
import com.hedera.block.server.config.TestConfigBuilder;
1312
import com.hedera.block.server.persistence.storage.PersistenceStorageConfig;
1413
import com.hedera.block.server.persistence.storage.path.ArchiveBlockPath;
1514
import com.hedera.block.server.persistence.storage.path.BlockAsLocalFilePathResolver;
@@ -22,6 +21,7 @@
2221
import com.hedera.pbj.runtime.UncheckedParseException;
2322
import com.hedera.pbj.runtime.io.buffer.Bytes;
2423
import com.swirlds.config.api.Configuration;
24+
import com.swirlds.config.api.ConfigurationBuilder;
2525
import java.io.IOException;
2626
import java.io.InputStream;
2727
import java.io.OutputStream;
@@ -53,12 +53,19 @@ class LocalGroupZipArchiveTaskTest {
5353

5454
@BeforeEach
5555
void setUp() throws IOException {
56-
final Configuration config = new TestConfigBuilder(PersistenceStorageConfig.class)
56+
57+
final Configuration config = ConfigurationBuilder.create()
58+
.autoDiscoverExtensions()
5759
.withValue(PERSISTENCE_STORAGE_COMPRESSION_TYPE, "NONE")
5860
.withValue(PERSISTENCE_STORAGE_ARCHIVE_BATCH_SIZE, String.valueOf(ARCHIVE_GROUP_SIZE))
59-
.withValue(PERSISTENCE_STORAGE_LIVE_ROOT_PATH_KEY, testTempDir.resolve("live"))
60-
.withValue(PERSISTENCE_STORAGE_ARCHIVE_ROOT_PATH_KEY, testTempDir.resolve("archive"))
61-
.getOrCreateConfig();
61+
.withValue(
62+
PERSISTENCE_STORAGE_LIVE_ROOT_PATH_KEY,
63+
testTempDir.resolve("live").toString())
64+
.withValue(
65+
PERSISTENCE_STORAGE_ARCHIVE_ROOT_PATH_KEY,
66+
testTempDir.resolve("archive").toString())
67+
.build();
68+
6269
persistenceStorageConfig = config.getConfigData(PersistenceStorageConfig.class);
6370
// using spy for path resolver because we should test with actual logic for path resolution
6471
// also asserts would be based on the findLive/findArchive methods, which are unit tested themselves

‎server/src/test/java/com/hedera/block/server/util/TestConfigUtil.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
package com.hedera.block.server.util;
33

44
import com.hedera.block.server.config.BlockNodeContext;
5-
import com.hedera.block.server.config.TestConfigBuilder;
65
import com.hedera.block.server.consumer.ConsumerConfig;
76
import com.hedera.block.server.metrics.MetricsService;
87
import com.hedera.block.server.metrics.MetricsServiceImpl;
98
import com.swirlds.common.metrics.platform.DefaultMetricsProvider;
109
import com.swirlds.config.api.Configuration;
10+
import com.swirlds.config.api.ConfigurationBuilder;
1111
import com.swirlds.config.extensions.sources.ClasspathFileConfigSource;
1212
import com.swirlds.metrics.api.Metrics;
1313
import edu.umd.cs.findbugs.annotations.NonNull;
@@ -28,7 +28,8 @@ public static BlockNodeContext getTestBlockNodeContext(@NonNull Map<String, Stri
2828
throws IOException {
2929

3030
// create test configuration
31-
TestConfigBuilder testConfigBuilder = new TestConfigBuilder(true)
31+
ConfigurationBuilder testConfigBuilder = ConfigurationBuilder.create()
32+
.autoDiscoverExtensions()
3233
.withSource(new ClasspathFileConfigSource(Path.of(TEST_APP_PROPERTIES_FILE)));
3334

3435
for (Map.Entry<String, String> entry : customProperties.entrySet()) {
@@ -39,7 +40,7 @@ public static BlockNodeContext getTestBlockNodeContext(@NonNull Map<String, Stri
3940

4041
testConfigBuilder = testConfigBuilder.withConfigDataType(ConsumerConfig.class);
4142

42-
Configuration testConfiguration = testConfigBuilder.getOrCreateConfig();
43+
Configuration testConfiguration = testConfigBuilder.build();
4344

4445
Metrics metrics = getTestMetrics(testConfiguration);
4546

0 commit comments

Comments
 (0)