Skip to content

Commit ab8740c

Browse files
committed
Merge branch 'main' into 19152-event-creation-birth-round-when-freezing
2 parents 11a9594 + 7fa2351 commit ab8740c

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

platform-sdk/consensus-utility/src/main/java/org/hiero/consensus/config/EventConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public record EventConfig(
2424
@ConfigProperty(defaultValue = "5") long eventsLogPeriod,
2525
@ConfigProperty(defaultValue = "/opt/hgcapp/eventsStreams") String eventsLogDir,
2626
@ConfigProperty(defaultValue = "true") boolean enableEventStreaming,
27-
@ConfigProperty(defaultValue = "false") boolean useBirthRoundAncientThreshold) {
27+
@ConfigProperty(defaultValue = "true") boolean useBirthRoundAncientThreshold) {
2828

2929
/**
3030
* @return the {@link AncientMode} based on useBirthRoundAncientThreshold

platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/event/preconsensus/DefaultInlinePcesWriterTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// SPDX-License-Identifier: Apache-2.0
22
package com.swirlds.platform.event.preconsensus;
33

4+
import static org.hiero.consensus.model.event.AncientMode.BIRTH_ROUND_THRESHOLD;
45
import static org.hiero.consensus.model.event.AncientMode.GENERATION_THRESHOLD;
56

67
import com.swirlds.base.test.fixtures.time.FakeTime;
@@ -18,6 +19,7 @@
1819
import java.util.List;
1920
import java.util.Random;
2021
import org.hiero.base.utility.test.fixtures.RandomUtils;
22+
import org.hiero.consensus.config.EventConfig_;
2123
import org.hiero.consensus.model.event.AncientMode;
2224
import org.hiero.consensus.model.event.PlatformEvent;
2325
import org.hiero.consensus.model.node.NodeId;
@@ -40,6 +42,7 @@ class DefaultInlinePcesWriterTest {
4042
@BeforeEach
4143
void beforeEach() {
4244
final Configuration configuration = new TestConfigBuilder()
45+
.withValue(EventConfig_.USE_BIRTH_ROUND_ANCIENT_THRESHOLD, ancientMode == BIRTH_ROUND_THRESHOLD)
4346
.withValue(PcesConfig_.DATABASE_DIRECTORY, tempDir.toString())
4447
.getOrCreateConfig();
4548
platformContext = buildContext(configuration);

platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/sync/ShadowGraphTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import com.swirlds.common.context.PlatformContext;
1616
import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder;
17+
import com.swirlds.config.extensions.test.fixtures.TestConfigBuilder;
1718
import com.swirlds.platform.gossip.NoOpIntakeEventCounter;
1819
import com.swirlds.platform.gossip.shadowgraph.ReservedEventWindow;
1920
import com.swirlds.platform.gossip.shadowgraph.ShadowEvent;
@@ -38,6 +39,7 @@
3839
import java.util.stream.Stream;
3940
import org.hiero.base.crypto.Hash;
4041
import org.hiero.base.utility.test.fixtures.RandomUtils;
42+
import org.hiero.consensus.config.EventConfig_;
4143
import org.hiero.consensus.model.event.EventDescriptorWrapper;
4244
import org.hiero.consensus.model.event.PlatformEvent;
4345
import org.hiero.consensus.model.hashgraph.EventWindow;
@@ -79,8 +81,11 @@ public void setup() {
7981
}
8082

8183
private void initShadowgraph(final Random random, final int numEvents, final int numNodes) {
82-
final PlatformContext platformContext =
83-
TestPlatformContextBuilder.create().build();
84+
final PlatformContext platformContext = TestPlatformContextBuilder.create()
85+
.withConfiguration(new TestConfigBuilder()
86+
.withValue(EventConfig_.USE_BIRTH_ROUND_ANCIENT_THRESHOLD, "false")
87+
.getOrCreateConfig())
88+
.build();
8489

8590
emitter = EventEmitterBuilder.newBuilder()
8691
.setRandomSeed(random.nextLong())

0 commit comments

Comments
 (0)