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

refactor: gossip module names and extract FallenBehindManager to gossip module #16113

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module com.hedera.consensus.gossip.impl {
requires transitive com.hedera.service.gossip;
module org.hiero.consensus.gossip.impl {
requires transitive org.hiero.consensus.gossip;

provides com.hedera.service.gossip.GossipService with
com.hedera.service.gossip.impl.GossipServiceImpl;
provides org.hiero.consensus.gossip.Gossip with
org.hiero.consensus.gossip.impl.GossipImpl;
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* limitations under the License.
*/

package com.hedera.service.gossip.impl;
package org.hiero.consensus.gossip.impl;

import com.hedera.service.gossip.GossipService;
import org.hiero.consensus.gossip.Gossip;

/**
* Implementation for the mock gossip service.
*/
public final class GossipServiceImpl implements GossipService {}
public final class GossipImpl implements Gossip {}
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
module com.hedera.service.gossip {
exports com.hedera.service.gossip;
module org.hiero.consensus.gossip {
exports org.hiero.consensus.gossip;

requires transitive com.swirlds.common;
requires static com.github.spotbugs.annotations;
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.swirlds.platform.gossip;
package org.hiero.consensus.gossip;

import com.swirlds.common.platform.NodeId;
import edu.umd.cs.findbugs.annotations.NonNull;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

package com.hedera.service.gossip;
package org.hiero.consensus.gossip;

/**
* Mock gossip service.
* Mock gossip.
*/
public interface GossipService {}
public interface Gossip {}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.hiero.consensus.gossip.FallenBehindManager;

/**
* A thread-safe implementation of {@link FallenBehindManager}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import com.swirlds.platform.event.AncientMode;
import com.swirlds.platform.event.PlatformEvent;
import com.swirlds.platform.eventhandling.EventConfig;
import com.swirlds.platform.gossip.FallenBehindManager;
import com.swirlds.platform.gossip.IntakeEventCounter;
import com.swirlds.platform.gossip.SyncException;
import com.swirlds.platform.gossip.sync.config.SyncConfig;
Expand All @@ -59,6 +58,7 @@
import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.hiero.consensus.gossip.FallenBehindManager;

/**
* The goal of the ShadowgraphSynchronizer is to compare graphs with a remote node, and update them so both sides have
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
import com.swirlds.common.context.PlatformContext;
import com.swirlds.common.metrics.FunctionGauge;
import com.swirlds.common.platform.NodeId;
import com.swirlds.platform.gossip.FallenBehindManager;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.util.List;
import java.util.Objects;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.hiero.consensus.gossip.FallenBehindManager;

/**
* A class that manages information about who we need to sync with, and whether we need to reconnect
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.swirlds.common.platform.NodeId;
import com.swirlds.common.threading.pool.ParallelExecutionException;
import com.swirlds.platform.Utilities;
import com.swirlds.platform.gossip.FallenBehindManager;
import com.swirlds.platform.gossip.IntakeEventCounter;
import com.swirlds.platform.gossip.SyncException;
import com.swirlds.platform.gossip.permits.SyncPermitProvider;
Expand All @@ -39,6 +38,7 @@
import java.util.Objects;
import java.util.function.BooleanSupplier;
import java.util.function.Supplier;
import org.hiero.consensus.gossip.FallenBehindManager;

/**
* Executes the sync protocol where events are exchanged with a peer and all events are sent and received in topological
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import com.swirlds.common.platform.NodeId;
import com.swirlds.common.threading.manager.ThreadManager;
import com.swirlds.config.api.Configuration;
import com.swirlds.platform.gossip.FallenBehindManager;
import com.swirlds.platform.metrics.ReconnectMetrics;
import com.swirlds.platform.reconnect.ReconnectController;
import com.swirlds.platform.reconnect.ReconnectProtocol;
Expand All @@ -33,6 +32,7 @@
import java.time.Duration;
import java.util.Objects;
import java.util.function.Supplier;
import org.hiero.consensus.gossip.FallenBehindManager;

/**
* Implementation of a factory for reconnect protocol
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import com.swirlds.common.context.PlatformContext;
import com.swirlds.common.platform.NodeId;
import com.swirlds.platform.gossip.FallenBehindManager;
import com.swirlds.platform.gossip.IntakeEventCounter;
import com.swirlds.platform.gossip.permits.SyncPermitProvider;
import com.swirlds.platform.gossip.shadowgraph.ShadowgraphSynchronizer;
Expand All @@ -30,6 +29,7 @@
import java.util.Objects;
import java.util.function.BooleanSupplier;
import java.util.function.Supplier;
import org.hiero.consensus.gossip.FallenBehindManager;

/**
* Implementation of a factory for sync protocol
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import com.swirlds.common.threading.manager.ThreadManager;
import com.swirlds.common.utility.throttle.RateLimitedLogger;
import com.swirlds.config.api.Configuration;
import com.swirlds.platform.gossip.FallenBehindManager;
import com.swirlds.platform.metrics.ReconnectMetrics;
import com.swirlds.platform.network.Connection;
import com.swirlds.platform.network.NetworkProtocolException;
Expand All @@ -41,6 +40,7 @@
import java.util.function.Supplier;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.hiero.consensus.gossip.FallenBehindManager;

/**
* Implements the reconnect protocol over a bidirectional network
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
requires transitive com.hedera.pbj.runtime;
requires transitive info.picocli;
requires transitive org.apache.logging.log4j;
requires transitive org.hiero.consensus.gossip;
requires com.swirlds.config.extensions;
requires com.swirlds.logging;
requires com.swirlds.merkle;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import com.swirlds.common.utility.ValueReference;
import com.swirlds.config.api.Configuration;
import com.swirlds.config.extensions.test.fixtures.TestConfigBuilder;
import com.swirlds.platform.gossip.FallenBehindManager;
import com.swirlds.platform.metrics.ReconnectMetrics;
import com.swirlds.platform.network.Connection;
import com.swirlds.platform.network.protocol.Protocol;
Expand All @@ -59,6 +58,7 @@
import java.util.List;
import java.util.stream.LongStream;
import java.util.stream.Stream;
import org.hiero.consensus.gossip.FallenBehindManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import com.swirlds.common.platform.NodeId;
import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder;
import com.swirlds.common.threading.pool.ParallelExecutionException;
import com.swirlds.platform.gossip.FallenBehindManager;
import com.swirlds.platform.gossip.IntakeEventCounter;
import com.swirlds.platform.gossip.SyncException;
import com.swirlds.platform.gossip.permits.SyncPermitProvider;
Expand All @@ -47,6 +46,7 @@
import java.io.IOException;
import java.time.Duration;
import java.util.List;
import org.hiero.consensus.gossip.FallenBehindManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ testModuleInfo {
requires("org.mockito.junit.jupiter")
requires("com.swirlds.metrics.api")
requires("org.mockito")
requires("org.hiero.consensus.gossip")
requiresStatic("com.github.spotbugs.annotations")
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import com.swirlds.common.test.fixtures.Randotron;
import com.swirlds.config.extensions.test.fixtures.TestConfigBuilder;
import com.swirlds.platform.Utilities;
import com.swirlds.platform.gossip.FallenBehindManager;
import com.swirlds.platform.gossip.FallenBehindManagerImpl;
import com.swirlds.platform.network.PeerInfo;
import com.swirlds.platform.network.topology.NetworkTopology;
Expand All @@ -35,6 +34,7 @@
import com.swirlds.platform.test.fixtures.addressbook.RandomAddressBookBuilder;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.hiero.consensus.gossip.FallenBehindManager;
import org.junit.jupiter.api.Test;

class FallenBehindManagerTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package com.swirlds.platform.test.sync;

import com.swirlds.common.platform.NodeId;
import com.swirlds.platform.gossip.FallenBehindManager;
import java.util.List;
import org.hiero.consensus.gossip.FallenBehindManager;

public class TestingSyncManager implements FallenBehindManager {
/** whether we have fallen behind or not */
Expand Down
Loading