Skip to content

Commit a24192e

Browse files
netopyrnetopyr
authored
chore: Always register all classes in org.hiero in ConstructableRegistry (#19229)
Signed-off-by: Michael Heinrichs <[email protected]>
1 parent 7fa2351 commit a24192e

File tree

39 files changed

+39
-39
lines changed

39 files changed

+39
-39
lines changed

‎hedera-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/exports/FileSignTool.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public static StreamType loadStreamTypeFromJson(final String jsonPath) throws IO
231231
public static void prepare(final StreamType streamType) throws ConstructableRegistryException {
232232
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
233233
registry.registerConstructables("com.swirlds.common");
234-
registry.registerConstructables("org.hiero.consensus");
234+
registry.registerConstructables("org.hiero");
235235

236236
if (streamType.getExtension().equalsIgnoreCase(RECORD_STREAM_EXTENSION)) {
237237
LOGGER.info(MARKER, "registering Constructables for parsing record stream files");

‎hedera-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/exports/RecordBlockNumberTool.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private RecordBlockNumberTool() {
4848
public static void prepare() throws ConstructableRegistryException {
4949
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
5050
registry.registerConstructables("com.swirlds.common");
51-
registry.registerConstructables("org.hiero.consensus");
51+
registry.registerConstructables("org.hiero");
5252

5353
LOGGER.info(MARKER, "registering Constructables for parsing record stream files");
5454
// if we are parsing new record stream files,

‎platform-sdk/platform-apps/tests/PlatformTestingTool/src/main/java/com/swirlds/demo/virtualmerkle/VirtualMerkleLeafHasher.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public static void main(final String[] args) throws IOException {
139139
registry.registerConstructables("com.swirlds.merkledb");
140140
registry.registerConstructables("com.swirlds.demo.virtualmerkle");
141141
registry.registerConstructables("com.swirlds.common.crypto");
142-
registry.registerConstructables("org.hiero.consensus.model.crypto");
142+
registry.registerConstructables("org.hiero");
143143
} catch (final ConstructableRegistryException e) {
144144
e.printStackTrace();
145145
return;

‎platform-sdk/platform-apps/tests/PlatformTestingTool/src/test/java/com/swirlds/demo/platform/ControlActionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class ControlActionTest {
1919
public static void setUp() throws ConstructableRegistryException {
2020
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
2121
registry.registerConstructables("com.swirlds");
22-
registry.registerConstructables("org.hiero.consensus");
22+
registry.registerConstructables("org.hiero");
2323
}
2424

2525
@Test

‎platform-sdk/platform-apps/tests/PlatformTestingTool/src/test/java/com/swirlds/demo/platform/MapValueSerializableTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class MapValueSerializableTest {
6565
public static void setUp() throws ConstructableRegistryException {
6666
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
6767
registry.registerConstructables("com.swirlds");
68-
registry.registerConstructables("org.hiero.consensus");
68+
registry.registerConstructables("org.hiero");
6969
cryptography = TestMerkleCryptoFactory.getInstance();
7070
}
7171

‎platform-sdk/platform-apps/tests/PlatformTestingTool/src/timingSensitive/java/com/swirlds/demo/merkle/map/MapValueFCQTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public class MapValueFCQTests {
6262
public static void setUp() throws ConstructableRegistryException {
6363
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
6464
registry.registerConstructables("com.swirlds");
65-
registry.registerConstructables("org.hiero.consensus");
65+
registry.registerConstructables("org.hiero");
6666
cryptography = TestMerkleCryptoFactory.getInstance();
6767

6868
mapKey = new MapKey(0, 0, random.nextLong());

‎platform-sdk/swirlds-benchmarks/src/jmh/java/com/swirlds/benchmark/BaseBench.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void setup() throws IOException {
114114
registry.registerConstructables("com.swirlds.benchmark");
115115
registry.registerConstructables("com.swirlds.common.crypto");
116116
registry.registerConstructables("com.swirlds.common");
117-
registry.registerConstructables("org.hiero.consensus");
117+
registry.registerConstructables("org.hiero");
118118
registry.registerConstructable(
119119
new ClassConstructorPair(BenchmarkMerkleInternal.class, BenchmarkMerkleInternal::new));
120120
registry.registerConstructable(new ClassConstructorPair(BenchmarkKey.class, BenchmarkKey::new));

‎platform-sdk/swirlds-common/src/test/java/com/swirlds/common/stream/StreamObjectTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class StreamObjectTest {
6969
static void setUp() throws ConstructableRegistryException, IOException {
7070
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
7171
registry.registerConstructables("com.swirlds.common");
72-
registry.registerConstructables("org.hiero.base");
72+
registry.registerConstructables("org.hiero");
7373
}
7474

7575
static void clearDir() throws IOException {

‎platform-sdk/swirlds-common/src/test/java/com/swirlds/common/stream/StreamUtilitiesTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class StreamUtilitiesTest {
100100
static void setUp() throws ConstructableRegistryException {
101101
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
102102
registry.registerConstructables("com.swirlds.common");
103-
registry.registerConstructables("org.hiero.base.crypto");
103+
registry.registerConstructables("org.hiero");
104104
}
105105

106106
private static File getResourceFile(final String path) {

‎platform-sdk/swirlds-merkle/src/test/java/com/swirlds/merkle/test/MerkleCopyTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class MerkleCopyTests {
4141
public static void setUp() throws ConstructableRegistryException {
4242
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
4343
registry.registerConstructables("com.swirlds.*");
44-
registry.registerConstructables("org.hiero.consensus");
44+
registry.registerConstructables("org.hiero");
4545
}
4646

4747
/**

‎platform-sdk/swirlds-merkle/src/test/java/com/swirlds/merkle/test/MerklePathReplacementTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class MerklePathReplacementTests {
4141
public static void setUp() throws ConstructableRegistryException {
4242
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
4343
registry.registerConstructables("com.swirlds.*");
44-
registry.registerConstructables("org.hiero.consensus");
44+
registry.registerConstructables("org.hiero");
4545
}
4646

4747
/**

‎platform-sdk/swirlds-merkle/src/test/java/com/swirlds/merkle/test/map/MMSerializeTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class MMSerializeTests {
3535
public static void setUp() throws ConstructableRegistryException {
3636
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
3737
registry.registerConstructables("com.swirlds");
38-
registry.registerConstructables("org.hiero.consensus");
38+
registry.registerConstructables("org.hiero");
3939
cryptography = TestMerkleCryptoFactory.getInstance();
4040
}
4141

‎platform-sdk/swirlds-merkle/src/test/java/com/swirlds/merkle/test/map/MerkleMapEntryKeyTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void serializationTest() throws IOException, ConstructableRegistryException {
112112
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
113113
registry.registerConstructables("com.swirlds.merkle.map");
114114
registry.registerConstructables("com.swirlds.common");
115-
registry.registerConstructables("org.hiero.consensus");
115+
registry.registerConstructables("org.hiero");
116116

117117
final MerkleMapEntryKey<SerializableLong> key = new MerkleMapEntryKey<>(new SerializableLong(1));
118118

‎platform-sdk/swirlds-merkle/src/test/java/com/swirlds/merkle/test/map/MerkleMapEntryTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void serializationTest() throws IOException, ConstructableRegistryException {
157157
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
158158
registry.registerConstructables("com.swirlds.merkle.map");
159159
registry.registerConstructables("com.swirlds.common");
160-
registry.registerConstructables("org.hiero.consensus");
160+
registry.registerConstructables("org.hiero");
161161

162162
final MerkleMapEntry<SerializableLong, KeyedMerkleLong<SerializableLong>> entry =
163163
new MerkleMapEntry<>(new SerializableLong(1), new KeyedMerkleLong<>(1));

‎platform-sdk/swirlds-merkle/src/timingSensitive/java/com/swirlds/merkle/test/MerkleSerializationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class MerkleSerializationTests {
6868
static void setUp() throws ConstructableRegistryException {
6969
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
7070
registry.registerConstructables("com.swirlds.common");
71-
registry.registerConstructables("org.hiero.consensus");
71+
registry.registerConstructables("org.hiero");
7272
}
7373

7474
private void resetDirectory() throws IOException {

‎platform-sdk/swirlds-merkle/src/timingSensitive/java/com/swirlds/merkle/test/MerkleSynchronizationBenchmarks.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static void setUp() throws FileNotFoundException {
4343
void registerClasses() throws ConstructableRegistryException {
4444
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
4545
registry.registerConstructables("com.swirlds.common");
46-
registry.registerConstructables("org.hiero.consensus");
46+
registry.registerConstructables("org.hiero");
4747
}
4848

4949
/**

‎platform-sdk/swirlds-merkle/src/timingSensitive/java/com/swirlds/merkle/test/MerkleSynchronizationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static void startup() throws ConstructableRegistryException, FileNotFound
5757
loadLog4jContext();
5858
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
5959
registry.registerConstructables("com.swirlds.common");
60-
registry.registerConstructables("org.hiero.consensus");
60+
registry.registerConstructables("org.hiero");
6161
}
6262

6363
/**

‎platform-sdk/swirlds-merkle/src/timingSensitive/java/com/swirlds/merkle/test/map/MerkleMapMemoryBenchmark.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static void setUp() throws ConstructableRegistryException {
2727
registry.registerConstructables("com.swirlds.MerkleMap");
2828
registry.registerConstructables("com.swirlds.merkletree");
2929
registry.registerConstructables("com.swirlds.common");
30-
registry.registerConstructables("org.hiero.consensus");
30+
registry.registerConstructables("org.hiero");
3131
}
3232

3333
/**

‎platform-sdk/swirlds-merkle/src/timingSensitive/java/com/swirlds/merkle/test/map/MerkleMapMemoryTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class MerkleMapMemoryTests {
3333
static void startup() throws ConstructableRegistryException {
3434
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
3535
registry.registerConstructables("com.swirlds");
36-
registry.registerConstructables("org.hiero.consensus");
36+
registry.registerConstructables("org.hiero");
3737
}
3838

3939
/**

‎platform-sdk/swirlds-merkle/src/timingSensitive/java/com/swirlds/merkle/test/map/MerkleMapTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static void setUp() throws ConstructableRegistryException {
8585
MerkleMapTestUtil.loadLogging();
8686
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
8787
registry.registerConstructables("com.swirlds");
88-
registry.registerConstructables("org.hiero.consensus");
88+
registry.registerConstructables("org.hiero");
8989
cryptography = TestMerkleCryptoFactory.getInstance();
9090
}
9191

‎platform-sdk/swirlds-merkle/src/timingSensitive/java/com/swirlds/merkle/test/tree/MerkleBinaryTreeTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public static <V extends MerkleNode> void updateCache(final V original) {}
124124
void setUp() throws ConstructableRegistryException {
125125
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
126126
registry.registerConstructables("com.swirlds");
127-
registry.registerConstructables("org.hiero.consensus");
127+
registry.registerConstructables("org.hiero");
128128
}
129129

130130
protected Stream<Arguments> buildSizeArguments() {

‎platform-sdk/swirlds-merkle/src/timingSensitive/java/com/swirlds/virtual/merkle/reconnect/VirtualMapReconnectTestBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public static void startup() throws ConstructableRegistryException, FileNotFound
132132
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
133133

134134
registry.registerConstructables("com.swirlds.common");
135-
registry.registerConstructables("org.hiero.consensus");
135+
registry.registerConstructables("org.hiero");
136136
registry.registerConstructables("com.swirlds.virtualmap");
137137
registry.registerConstructable(new ClassConstructorPair(QueryResponse.class, QueryResponse::new));
138138
registry.registerConstructable(new ClassConstructorPair(DummyMerkleInternal.class, DummyMerkleInternal::new));

‎platform-sdk/swirlds-merkledb/src/test/java/com/swirlds/merkledb/VirtualMapSerializationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static void setUp() throws ConstructableRegistryException {
6666
registry.registerConstructables("com.swirlds.merkledb");
6767
registry.registerConstructables("com.swirlds.virtualmap");
6868
registry.registerConstructables("com.swirlds.common");
69-
registry.registerConstructables("org.hiero.consensus");
69+
registry.registerConstructables("org.hiero");
7070
ConstructableRegistry.getInstance()
7171
.registerConstructable(new ClassConstructorPair(
7272
MerkleDbDataSourceBuilder.class, () -> new MerkleDbDataSourceBuilder(CONFIGURATION)));

‎platform-sdk/swirlds-merkledb/src/timingSensitive/java/com/swirlds/merkledb/MerkleDbSnapshotTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class MerkleDbSnapshotTest {
7070
static void setup() throws Exception {
7171
ConstructableRegistry registry = ConstructableRegistry.getInstance();
7272
registry.registerConstructables("com.swirlds.common");
73-
registry.registerConstructables("org.hiero.consensus");
73+
registry.registerConstructables("org.hiero");
7474
registry.registerConstructables("com.swirlds.merkledb");
7575
registry.registerConstructables("com.swirlds.virtualmap");
7676
registry.registerConstructable(new ClassConstructorPair(

‎platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/SignedStateFileReadWriteTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static void beforeAll() throws ConstructableRegistryException {
6565
final var registry = ConstructableRegistry.getInstance();
6666
platformVersion =
6767
SemanticVersion.newBuilder().major(RandomUtils.nextInt(1, 100)).build();
68-
registry.registerConstructables("org.hiero.base.crypto");
68+
registry.registerConstructables("org.hiero");
6969
registry.registerConstructables("com.swirlds.platform");
7070
registry.registerConstructables("com.swirlds.state");
7171
registry.registerConstructables("com.swirlds.virtualmap");

‎platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/StateFileManagerTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class StateFileManagerTests {
8989
static void beforeAll() throws ConstructableRegistryException {
9090
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
9191
registry.registerConstructables("com.swirlds");
92-
registry.registerConstructables("org.hiero.base.crypto");
92+
registry.registerConstructables("org.hiero");
9393
registerMerkleStateRootClassIds();
9494
}
9595

‎platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/event/CesEventTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class CesEventTest {
1818
@BeforeAll
1919
public static void setUp() throws ConstructableRegistryException {
2020
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
21-
registry.registerConstructables("org.hiero.consensus");
21+
registry.registerConstructables("org.hiero");
2222
}
2323

2424
@Test

‎platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/reconnect/VirtualMapReconnectTestBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public static void startup() throws ConstructableRegistryException, FileNotFound
101101
loadLog4jContext();
102102
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
103103
registry.registerConstructables("com.swirlds.common");
104-
registry.registerConstructables("org.hiero.consensus");
104+
registry.registerConstructables("org.hiero");
105105
registry.registerConstructable(new ClassConstructorPair(DummyMerkleInternal.class, DummyMerkleInternal::new));
106106
registry.registerConstructable(new ClassConstructorPair(DummyMerkleLeaf.class, DummyMerkleLeaf::new));
107107
registry.registerConstructable(new ClassConstructorPair(VirtualMap.class, () -> new VirtualMap(CONFIGURATION)));

‎platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/recovery/EventStreamMultiFileIteratorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class EventStreamMultiFileIteratorTest {
4747
static void beforeAll() throws ConstructableRegistryException {
4848
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
4949
registry.registerConstructables("com.swirlds");
50-
registry.registerConstructables("org.hiero.consensus");
50+
registry.registerConstructables("org.hiero");
5151
}
5252

5353
public static void assertEventsAreEqual(final CesEvent expected, final CesEvent actual) {

‎platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/recovery/EventStreamPathIteratorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class EventStreamPathIteratorTest {
4343
static void beforeAll() throws ConstructableRegistryException {
4444
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
4545
registry.registerConstructables("com.swirlds");
46-
registry.registerConstructables("org.hiero.consensus");
46+
registry.registerConstructables("org.hiero");
4747
}
4848

4949
@Test

‎platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/recovery/EventStreamRoundIteratorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class EventStreamRoundIteratorTest {
4545
static void beforeAll() throws ConstructableRegistryException {
4646
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
4747
registry.registerConstructables("com.swirlds");
48-
registry.registerConstructables("org.hiero.consensus");
48+
registry.registerConstructables("org.hiero");
4949
}
5050

5151
public static void assertEventsAreEqual(final CesEvent expected, final CesEvent actual) {

‎platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/recovery/EventStreamSingleFileIteratorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class EventStreamSingleFileIteratorTest {
3939
static void beforeAll() throws ConstructableRegistryException {
4040
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
4141
registry.registerConstructables("com.swirlds");
42-
registry.registerConstructables("org.hiero.consensus");
42+
registry.registerConstructables("org.hiero");
4343
}
4444

4545
public static void assertEventsAreEqual(final CesEvent expected, final CesEvent actual) {

‎platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/recovery/ObjectStreamIteratorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ObjectStreamIteratorTest {
4242
static void beforeAll() throws ConstructableRegistryException {
4343
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
4444
registry.registerConstructables("com.swirlds");
45-
registry.registerConstructables("org.hiero.consensus");
45+
registry.registerConstructables("org.hiero");
4646
}
4747

4848
public static void assertEventsAreEqual(final CesEvent expected, final CesEvent actual) {

‎platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/scratchpad/ScratchpadTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void afterEach() throws IOException {
6767
static void beforeAll() throws ConstructableRegistryException {
6868
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
6969
registry.registerConstructables("com.swirlds");
70-
registry.registerConstructables("org.hiero.consensus");
70+
registry.registerConstructables("org.hiero");
7171
}
7272

7373
@Test

‎platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/state/signed/StartupStateUtilsTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void afterEach() throws IOException {
9393
static void beforeAll() throws ConstructableRegistryException {
9494
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
9595
registry.registerConstructables("com.swirlds");
96-
registry.registerConstructables("org.hiero.consensus");
96+
registry.registerConstructables("org.hiero");
9797
registry.registerConstructable(new ClassConstructorPair(TestMerkleStateRoot.class, TestMerkleStateRoot::new));
9898
}
9999

‎platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/MerkleTestBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ protected void setupConstructableRegistry() {
251251
registry.registerConstructables("com.swirlds.virtualmap");
252252
registry.registerConstructables("com.swirlds.common.merkle");
253253
registry.registerConstructables("com.swirlds.common");
254-
registry.registerConstructables("org.hiero.base.crypto");
254+
registry.registerConstructables("org.hiero");
255255
registry.registerConstructables("com.swirlds.merkle");
256256
registry.registerConstructables("com.swirlds.merkle.tree");
257257
ConstructableRegistry.getInstance()

‎platform-sdk/swirlds-virtualmap/src/jmh/java/com/swirlds/virtualmap/benchmark/reconnect/VirtualMapReconnectBenchBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected static void startup() throws ConstructableRegistryException, FileNotFo
6868
loadLog4jContext();
6969
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
7070
registry.registerConstructables("com.swirlds.common");
71-
registry.registerConstructables("org.hiero.consensus");
71+
registry.registerConstructables("org.hiero");
7272
registry.registerConstructables("com.swirlds.virtualmap");
7373
registry.registerConstructable(new ClassConstructorPair(QueryResponse.class, QueryResponse::new));
7474
registry.registerConstructable(new ClassConstructorPair(DummyMerkleInternal.class, DummyMerkleInternal::new));

‎platform-sdk/swirlds-virtualmap/src/testFixtures/java/com/swirlds/virtualmap/test/fixtures/VirtualTestBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static void globalSetup() throws Exception {
114114
// Ensure VirtualNodeCache.release() returns clean
115115
System.setProperty("syncCleaningPool", "true");
116116
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
117-
registry.registerConstructables("org.hiero.base.crypto");
117+
registry.registerConstructables("org.hiero");
118118
registry.registerConstructables("com.swirlds.virtualmap");
119119
registry.registerConstructables("com.swirlds.virtualmap.test.fixtures");
120120
registry.registerConstructable(new ClassConstructorPair(TestKey.class, () -> new TestKey(0L)));

‎platform-sdk/swirlds-virtualmap/src/timingSensitive/java/com/swirlds/virtualmap/internal/reconnect/VirtualMapReconnectTestBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public static void startup() throws ConstructableRegistryException, FileNotFound
104104
loadLog4jContext();
105105
final ConstructableRegistry registry = ConstructableRegistry.getInstance();
106106
registry.registerConstructables("com.swirlds.common");
107-
registry.registerConstructables("org.hiero.consensus");
107+
registry.registerConstructables("org.hiero");
108108
registry.registerConstructable(new ClassConstructorPair(QueryResponse.class, QueryResponse::new));
109109
registry.registerConstructable(new ClassConstructorPair(DummyMerkleInternal.class, DummyMerkleInternal::new));
110110
registry.registerConstructable(new ClassConstructorPair(DummyMerkleLeaf.class, DummyMerkleLeaf::new));

0 commit comments

Comments
 (0)