Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: solder test input wire for TurleTests to StateSignatureCollector output wire #17864

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
654b30d
test: enhance TurtleTests to connect a test component to the Consensu…
IvanKavaldzhiev Feb 7, 2025
47202f6
nit: keep instance of the holder, so that it can be used for validations
IvanKavaldzhiev Feb 7, 2025
1dc6400
Merge remote-tracking branch 'origin/main' into 17638-connect-test-co…
IvanKavaldzhiev Feb 10, 2025
58a5f2a
Merge remote-tracking branch 'origin/main' into 17638-connect-test-co…
IvanKavaldzhiev Feb 11, 2025
ffefc53
nit: resolve PR comments
IvanKavaldzhiev Feb 11, 2025
88557bd
Merge remote-tracking branch 'origin/main' into 17638-connect-test-co…
IvanKavaldzhiev Feb 12, 2025
c95ab05
nit: resolve PR comments
IvanKavaldzhiev Feb 12, 2025
b65e2a6
refactor: allow registering of multiple custom input wires
IvanKavaldzhiev Feb 12, 2025
e71fd4b
Merge remote-tracking branch 'origin/17638-connect-test-component-to-…
IvanKavaldzhiev Feb 12, 2025
ba72e96
test: solder test input wire for TurleTests to StateSignatureCollecto…
IvanKavaldzhiev Feb 12, 2025
06c0155
Merge remote-tracking branch 'origin/main' into 17638-connect-test-co…
IvanKavaldzhiev Feb 12, 2025
8fff5a5
Merge remote-tracking branch 'origin/17638-connect-test-component-to-…
IvanKavaldzhiev Feb 12, 2025
6c853d8
Merge remote-tracking branch 'origin/main' into 17638-connect-test-co…
IvanKavaldzhiev Feb 13, 2025
7ebd8bf
refactor: moves platformWiring bind method from SwirldsPlatform to Pl…
IvanKavaldzhiev Feb 13, 2025
fea264c
refactor: move more code into PlatformBuilder
IvanKavaldzhiev Feb 13, 2025
c9c9166
Merge remote-tracking branch 'origin/main' into 17638-connect-test-co…
IvanKavaldzhiev Feb 14, 2025
dab91b5
refactor: return some code restructure and simplify changes
IvanKavaldzhiev Feb 14, 2025
443207e
Merge remote-tracking branch 'origin/main' into 17638-connect-test-co…
IvanKavaldzhiev Feb 14, 2025
0c59232
style: spotless apply
IvanKavaldzhiev Feb 14, 2025
e447ee2
nit: remove redundant code
IvanKavaldzhiev Feb 14, 2025
ba1497a
nit: resolve PR comments
IvanKavaldzhiev Feb 14, 2025
d089301
Merge remote-tracking branch 'origin/main' into 17638-connect-test-co…
IvanKavaldzhiev Feb 14, 2025
22630a6
Merge remote-tracking branch 'origin/main' into 17638-connect-test-co…
IvanKavaldzhiev Feb 17, 2025
d9bf8a5
Merge remote-tracking branch 'origin/17638-connect-test-component-to-…
IvanKavaldzhiev Feb 17, 2025
2e316fe
nit: remove unnecessary code
IvanKavaldzhiev Feb 17, 2025
76af282
Merge remote-tracking branch 'origin/main' into 17639-connect-test-co…
IvanKavaldzhiev Feb 20, 2025
f683d96
style: spotless apply
IvanKavaldzhiev Feb 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
nit: resolve PR comments
Signed-off-by: Ivan Kavaldzhiev <ivankavaldzhiev@gmail.com>
  • Loading branch information
IvanKavaldzhiev committed Feb 12, 2025
commit c95ab05b3276daae767a75740a512ae4175e8938
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
import com.swirlds.common.platform.NodeId;
import com.swirlds.common.stream.RunningEventHashOverride;
import com.swirlds.common.utility.AutoCloseableWrapper;
import com.swirlds.component.framework.component.ComponentWiring;
import com.swirlds.component.framework.wires.input.InputWire;
import com.swirlds.platform.builder.PlatformBuildingBlocks;
import com.swirlds.platform.builder.PlatformComponentBuilder;
import com.swirlds.platform.components.AppNotifier;
Expand All @@ -45,7 +43,6 @@
import com.swirlds.platform.components.DefaultSavedStateController;
import com.swirlds.platform.components.EventWindowManager;
import com.swirlds.platform.components.SavedStateController;
import com.swirlds.platform.components.consensus.ConsensusEngine;
import com.swirlds.platform.config.StateConfig;
import com.swirlds.platform.consensus.EventWindow;
import com.swirlds.platform.crypto.KeysAndCerts;
Expand All @@ -57,7 +54,6 @@
import com.swirlds.platform.event.preconsensus.PcesFileTracker;
import com.swirlds.platform.event.preconsensus.PcesReplayer;
import com.swirlds.platform.eventhandling.EventConfig;
import com.swirlds.platform.internal.ConsensusRound;
import com.swirlds.platform.metrics.RuntimeMetrics;
import com.swirlds.platform.pool.TransactionPoolNexus;
import com.swirlds.platform.publisher.DefaultPlatformPublisher;
Expand Down Expand Up @@ -214,7 +210,7 @@
logger.info(STARTUP.getMarker(), "Starting with roster history:\n{}", blocks.rosterHistory());
currentRoster = blocks.rosterHistory().getCurrentRoster();

platformWiring = new PlatformWiring(platformContext, blocks.model(), blocks.applicationCallbacks());
platformWiring = blocks.platformWiring();

Check warning on line 213 in platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/SwirldsPlatform.java

View check run for this annotation

Codecov / codecov/patch

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/SwirldsPlatform.java#L213

Added line #L213 was not covered by tests

registerRosterMetrics(platformContext.getMetrics(), currentRoster, selfId);

Expand Down Expand Up @@ -526,15 +522,4 @@
? AutoCloseableWrapper.empty()
: new AutoCloseableWrapper<>((T) wrapper.get().getState(), wrapper::close);
}

/**
* Binds a custom input wire to the consensus engine output wire. This method is mainly created for test purposes.
*
* @param inputWire to bind
*/
public void bindInputWireToConsensusEngine(final InputWire<List<ConsensusRound>> inputWire) {
final ComponentWiring<ConsensusEngine, List<ConsensusRound>> consensusEngineWiring =
platformWiring.getConsensusEngineWiring();
consensusEngineWiring.getOutputWire().solderTo(inputWire);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import com.swirlds.platform.system.SoftwareVersion;
import com.swirlds.platform.system.status.StatusActionSubmitter;
import com.swirlds.platform.util.RandomBuilder;
import com.swirlds.platform.wiring.PlatformWiring;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.io.IOException;
import java.io.UncheckedIOException;
Expand Down Expand Up @@ -486,6 +487,8 @@
randomBuilder = new RandomBuilder();
}

final PlatformWiring platformWiring = new PlatformWiring(platformContext, model, callbacks);

Check warning on line 490 in platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformBuilder.java

View check run for this annotation

Codecov / codecov/patch

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformBuilder.java#L490

Added line #L490 was not covered by tests

final PlatformBuildingBlocks buildingBlocks = new PlatformBuildingBlocks(
platformContext,
model,
Expand Down Expand Up @@ -515,7 +518,8 @@
new AtomicReference<>(),
firstPlatform,
stateLifecycles,
platformStateFacade);
platformStateFacade,
platformWiring);

return new PlatformComponentBuilder(buildingBlocks);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import com.swirlds.platform.system.SoftwareVersion;
import com.swirlds.platform.system.status.StatusActionSubmitter;
import com.swirlds.platform.util.RandomBuilder;
import com.swirlds.platform.wiring.PlatformWiring;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.time.Instant;
Expand Down Expand Up @@ -97,6 +98,7 @@
* reconnect, can be removed once reconnect is made compatible with the
* wiring framework
* @param platformStateFacade the facade to access the platform state
* @param platformWiring the wiring to use inside the platform
*/
public record PlatformBuildingBlocks(
@NonNull PlatformContext platformContext,
Expand Down Expand Up @@ -127,7 +129,8 @@
@NonNull AtomicReference<Runnable> clearAllPipelinesForReconnectReference,
boolean firstPlatform,
@NonNull StateLifecycles stateLifecycles,
@NonNull PlatformStateFacade platformStateFacade) {
@NonNull PlatformStateFacade platformStateFacade,
@NonNull PlatformWiring platformWiring) {

public PlatformBuildingBlocks {
requireNonNull(platformContext);
Expand All @@ -154,5 +157,6 @@
requireNonNull(getLatestCompleteStateReference);
requireNonNull(loadReconnectStateReference);
requireNonNull(clearAllPipelinesForReconnectReference);
requireNonNull(platformWiring);

Check warning on line 160 in platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformBuildingBlocks.java

View check run for this annotation

Codecov / codecov/patch

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformBuildingBlocks.java#L160

Added line #L160 was not covered by tests
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
import com.swirlds.platform.system.status.DefaultStatusStateMachine;
import com.swirlds.platform.system.status.StatusStateMachine;
import com.swirlds.platform.util.MetricsDocUtils;
import com.swirlds.platform.wiring.PlatformWiring;
import com.swirlds.platform.wiring.components.Gossip;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.io.IOException;
Expand Down Expand Up @@ -212,8 +213,8 @@
used = true;

try (final ReservedSignedState initialState = blocks.initialState()) {
swirldsPlatform = new SwirldsPlatform(this);
return swirldsPlatform;

Check warning on line 217 in platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformComponentBuilder.java

View check run for this annotation

Codecov / codecov/patch

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformComponentBuilder.java#L216-L217

Added lines #L216 - L217 were not covered by tests
} finally {
if (metricsDocumentationEnabled) {
// Future work: eliminate the static variables that require this code to exist
Expand All @@ -229,13 +230,16 @@
}

/**
* Binds a custom input wire to the consensus engine output wire. This method is mainly created for test purposes.
* Binds a custom input wire to the consensus engine output wire.
*
* @param inputWire to bind
* @param inputWire with matching type of consensus engine output to bind
*/
public void bindInputWireToConsensusEngine(final InputWire<List<ConsensusRound>> inputWire) {
swirldsPlatform.bindInputWireToConsensusEngine(inputWire);
public void withInputWireToConsensusEngine(final InputWire<List<ConsensusRound>> inputWire) {
final PlatformWiring platformWiring = blocks.platformWiring();
final ComponentWiring<ConsensusEngine, List<ConsensusRound>> consensusEngineWiring =
platformWiring.getConsensusEngineWiring();
consensusEngineWiring.getOutputWire().solderTo(inputWire);
}

Check warning on line 242 in platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformComponentBuilder.java

View check run for this annotation

Codecov / codecov/patch

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformComponentBuilder.java#L238-L242

Added lines #L238 - L242 were not covered by tests

/**
* If enabled, building this object will cause a metrics document to be generated. Default is true.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public class TurtleNode {

final InputWire<List<ConsensusRound>> consensusRoundsHolderInputWire =
consensusRoundsHolderWiring.getInputWire(ConsensusRoundsHolder::interceptRounds);
platformComponentBuilder.bindInputWireToConsensusEngine(consensusRoundsHolderInputWire);
platformComponentBuilder.withInputWireToConsensusEngine(consensusRoundsHolderInputWire);
}

/**
Expand Down
Loading