-
Notifications
You must be signed in to change notification settings - Fork 143
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into dependabot/github_actions/docker/setup-qemu-…
…action-3.3.0
- Loading branch information
Showing
31 changed files
with
1,272 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
...de/hedera-app/src/main/java/com/hedera/node/app/state/listeners/FatalIssListenerImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * Copyright (C) 2025 Hedera Hashgraph, LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.hedera.node.app.state.listeners; | ||
|
|
||
| import com.swirlds.platform.system.state.notifications.AsyncFatalIssListener; | ||
| import com.swirlds.platform.system.state.notifications.IssNotification; | ||
| import edu.umd.cs.findbugs.annotations.NonNull; | ||
| import javax.inject.Inject; | ||
| import javax.inject.Singleton; | ||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
|
|
||
| @Singleton | ||
| public class FatalIssListenerImpl implements AsyncFatalIssListener { | ||
|
|
||
| private static final Logger log = LogManager.getLogger(FatalIssListenerImpl.class); | ||
|
|
||
| @Inject | ||
| public FatalIssListenerImpl() { | ||
| // no-op | ||
| } | ||
|
|
||
| @Override | ||
| public void notify(@NonNull final IssNotification data) { | ||
| log.warn("ISS detected (type={}, round={})", data.getIssType(), data.getRound()); | ||
| } | ||
| } |
137 changes: 137 additions & 0 deletions
137
hedera-node/hedera-app/src/test/java/com/hedera/node/app/ServicesMainTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| /* | ||
| * Copyright (C) 2021-2025 Hedera Hashgraph, LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.hedera.node.app; | ||
|
|
||
| import static com.swirlds.platform.system.SystemExitCode.NODE_ADDRESS_MISMATCH; | ||
| import static org.assertj.core.api.Assertions.assertThatThrownBy; | ||
| import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; | ||
| import static org.junit.jupiter.api.Assertions.assertSame; | ||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.ArgumentMatchers.anyString; | ||
| import static org.mockito.ArgumentMatchers.eq; | ||
| import static org.mockito.BDDMockito.given; | ||
| import static org.mockito.Mock.Strictness.LENIENT; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.mockStatic; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import com.hedera.hapi.node.base.SemanticVersion; | ||
| import com.hedera.node.app.version.ServicesSoftwareVersion; | ||
| import com.swirlds.metrics.api.Metrics; | ||
| import com.swirlds.platform.config.legacy.ConfigurationException; | ||
| import com.swirlds.platform.config.legacy.LegacyConfigProperties; | ||
| import com.swirlds.platform.config.legacy.LegacyConfigPropertiesLoader; | ||
| import com.swirlds.platform.state.PlatformMerkleStateRoot; | ||
| import com.swirlds.platform.system.SystemExitUtils; | ||
| import com.swirlds.platform.system.address.AddressBook; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.mockito.Mock; | ||
| import org.mockito.MockedStatic; | ||
| import org.mockito.junit.jupiter.MockitoExtension; | ||
|
|
||
| @ExtendWith(MockitoExtension.class) | ||
| final class ServicesMainTest { | ||
| private static final MockedStatic<LegacyConfigPropertiesLoader> legacyConfigPropertiesLoaderMockedStatic = | ||
| mockStatic(LegacyConfigPropertiesLoader.class); | ||
|
|
||
| @Mock(strictness = LENIENT) | ||
| private LegacyConfigProperties legacyConfigProperties = mock(LegacyConfigProperties.class); | ||
|
|
||
| @Mock(strictness = LENIENT) | ||
| private Metrics metrics; | ||
|
|
||
| @Mock(strictness = LENIENT) | ||
| private Hedera hedera; | ||
|
|
||
| @Mock | ||
| private PlatformMerkleStateRoot merkleStateRoot; | ||
|
|
||
| private final ServicesMain subject = new ServicesMain(); | ||
|
|
||
| @AfterAll | ||
| static void afterAll() { | ||
| legacyConfigPropertiesLoaderMockedStatic.close(); | ||
| } | ||
|
|
||
| // no local nodes specified, no environment nodes specified | ||
| @Test | ||
| void throwsExceptionOnNoNodesToRun() { | ||
| withBadCommandLineArgs(); | ||
| String[] args = {}; | ||
| try (MockedStatic<SystemExitUtils> systemExitUtilsMockedStatic = mockStatic(SystemExitUtils.class)) { | ||
| assertThatThrownBy(() -> ServicesMain.main(args)).isInstanceOf(ConfigurationException.class); | ||
| systemExitUtilsMockedStatic.verify( | ||
| () -> SystemExitUtils.exitSystem(eq(NODE_ADDRESS_MISMATCH), anyString())); | ||
| } | ||
| } | ||
|
|
||
| // local node specified which does not match the address book | ||
| @Test | ||
| void hardExitOnNonMatchingNodeId() { | ||
| withBadCommandLineArgs(); | ||
| String[] args = {"-local", "1234"}; // 1234 does not match anything in address book | ||
|
|
||
| try (MockedStatic<SystemExitUtils> systemExitUtilsMockedStatic = mockStatic(SystemExitUtils.class)) { | ||
| assertThatThrownBy(() -> ServicesMain.main(args)).isInstanceOf(ConfigurationException.class); | ||
| systemExitUtilsMockedStatic.verify( | ||
| () -> SystemExitUtils.exitSystem(eq(NODE_ADDRESS_MISMATCH), anyString())); | ||
| } | ||
| } | ||
|
|
||
| // more than one local node specified on the commandline | ||
| @Test | ||
| void hardExitOnTooManyCliNodes() { | ||
| withBadCommandLineArgs(); | ||
| String[] args = {"-local", "1", "2"}; // both "1" and "2" match entries in address book | ||
|
|
||
| try (MockedStatic<SystemExitUtils> systemExitUtilsMockedStatic = mockStatic(SystemExitUtils.class)) { | ||
| assertThatThrownBy(() -> ServicesMain.main(args)).isInstanceOf(ConfigurationException.class); | ||
| systemExitUtilsMockedStatic.verify(() -> SystemExitUtils.exitSystem(NODE_ADDRESS_MISMATCH)); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void delegatesSoftwareVersion() { | ||
| ServicesMain.initGlobal(hedera, metrics); | ||
| final var mockVersion = new ServicesSoftwareVersion(SemanticVersion.DEFAULT); | ||
| given(hedera.getSoftwareVersion()).willReturn(mockVersion); | ||
| assertSame(mockVersion, subject.getSoftwareVersion()); | ||
| } | ||
|
|
||
| @Test | ||
| void noopsAsExpected() { | ||
| ServicesMain.initGlobal(hedera, metrics); | ||
| assertDoesNotThrow(subject::run); | ||
| } | ||
|
|
||
| @Test | ||
| void createsNewMerkleStateRoot() { | ||
| ServicesMain.initGlobal(hedera, metrics); | ||
| given(hedera.newMerkleStateRoot()).willReturn(merkleStateRoot); | ||
| assertSame(merkleStateRoot, subject.newMerkleStateRoot()); | ||
| } | ||
|
|
||
| private void withBadCommandLineArgs() { | ||
| legacyConfigPropertiesLoaderMockedStatic | ||
| .when(() -> LegacyConfigPropertiesLoader.loadConfigFile(any())) | ||
| .thenReturn(legacyConfigProperties); | ||
|
|
||
| when(legacyConfigProperties.getAddressBook()).thenReturn(new AddressBook()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.