diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/Authored.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/Authored.java similarity index 92% rename from consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/Authored.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/Authored.java index cfdfdb89aa..deab5a051f 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/Authored.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/Authored.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.besu.consensus.ibft.payload; +package org.hyperledger.besu.consensus.common.bft.payload; import org.hyperledger.besu.ethereum.core.Address; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/Payload.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/Payload.java similarity index 95% rename from consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/Payload.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/Payload.java index 3d4b60bf30..87e9874e8f 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/Payload.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/Payload.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.besu.consensus.ibft.payload; +package org.hyperledger.besu.consensus.common.bft.payload; import org.hyperledger.besu.ethereum.core.Hash; import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundSpecific.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/RoundSpecific.java similarity index 92% rename from consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundSpecific.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/RoundSpecific.java index b569fea632..4243c81256 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundSpecific.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/RoundSpecific.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.besu.consensus.ibft.payload; +package org.hyperledger.besu.consensus.common.bft.payload; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/SignedData.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/SignedData.java similarity index 97% rename from consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/SignedData.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/SignedData.java index c48084e7b6..4887190d87 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/SignedData.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/SignedData.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.besu.consensus.ibft.payload; +package org.hyperledger.besu.consensus.common.bft.payload; import org.hyperledger.besu.crypto.SECP256K1.Signature; import org.hyperledger.besu.ethereum.core.Address; diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/IntegrationTestHelpers.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/IntegrationTestHelpers.java index 35ad98f761..208555da95 100644 --- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/IntegrationTestHelpers.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/IntegrationTestHelpers.java @@ -15,12 +15,12 @@ package org.hyperledger.besu.consensus.ibft.support; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.IbftBlockHashing; import org.hyperledger.besu.consensus.ibft.IbftExtraData; import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; import org.hyperledger.besu.consensus.ibft.payload.CommitPayload; import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts; import org.hyperledger.besu.crypto.NodeKey; import org.hyperledger.besu.crypto.SECP256K1.Signature; diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/RoundSpecificPeers.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/RoundSpecificPeers.java index 1e486ce7eb..f49b671bb5 100644 --- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/RoundSpecificPeers.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/RoundSpecificPeers.java @@ -19,6 +19,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.Payload; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.messagedata.CommitMessageData; import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; import org.hyperledger.besu.consensus.ibft.messagedata.PrepareMessageData; @@ -26,10 +28,8 @@ import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData; import org.hyperledger.besu.consensus.ibft.messagedata.RoundChangeMessageData; import org.hyperledger.besu.consensus.ibft.messagewrappers.IbftMessage; import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; -import org.hyperledger.besu.consensus.ibft.payload.Payload; import org.hyperledger.besu.consensus.ibft.payload.PreparePayload; import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts; import org.hyperledger.besu.crypto.SECP256K1.Signature; import org.hyperledger.besu.ethereum.core.Hash; diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/ReceivedFutureProposalTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/ReceivedFutureProposalTest.java index 49ed670f58..95db51b71f 100644 --- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/ReceivedFutureProposalTest.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/ReceivedFutureProposalTest.java @@ -17,12 +17,12 @@ package org.hyperledger.besu.consensus.ibft.tests; import static org.hyperledger.besu.consensus.ibft.support.IntegrationTestHelpers.createValidPreparedRoundArtifacts; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts; import org.hyperledger.besu.consensus.ibft.support.IntegrationTestHelpers; import org.hyperledger.besu.consensus.ibft.support.RoundSpecificPeers; diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/RoundChangeTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/RoundChangeTest.java index c171119cf1..29bd49b2bc 100644 --- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/RoundChangeTest.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/RoundChangeTest.java @@ -19,6 +19,7 @@ import static java.util.Optional.empty; import static org.hyperledger.besu.consensus.ibft.support.IntegrationTestHelpers.createValidPreparedRoundArtifacts; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.IbftHelpers; import org.hyperledger.besu.consensus.ibft.ibftevent.RoundExpiry; import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; @@ -27,7 +28,6 @@ import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts; import org.hyperledger.besu.consensus.ibft.support.RoundSpecificPeers; import org.hyperledger.besu.consensus.ibft.support.TestContext; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftGossip.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftGossip.java index 95012dcd58..9374b026ea 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftGossip.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftGossip.java @@ -14,13 +14,13 @@ */ package org.hyperledger.besu.consensus.ibft; +import org.hyperledger.besu.consensus.common.bft.payload.Authored; import org.hyperledger.besu.consensus.ibft.messagedata.CommitMessageData; import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; import org.hyperledger.besu.consensus.ibft.messagedata.PrepareMessageData; import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData; import org.hyperledger.besu.consensus.ibft.messagedata.RoundChangeMessageData; import org.hyperledger.besu.consensus.ibft.network.ValidatorMulticaster; -import org.hyperledger.besu.consensus.ibft.payload.Authored; import org.hyperledger.besu.ethereum.core.Address; import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftHelpers.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftHelpers.java index c51ea50282..20c37ed41d 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftHelpers.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftHelpers.java @@ -14,9 +14,9 @@ */ package org.hyperledger.besu.consensus.ibft; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate; import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; import org.hyperledger.besu.crypto.SECP256K1.Signature; import org.hyperledger.besu.ethereum.core.Block; import org.hyperledger.besu.ethereum.core.BlockHeader; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Commit.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Commit.java index c106736da7..a38c9d6406 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Commit.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Commit.java @@ -14,9 +14,9 @@ */ package org.hyperledger.besu.consensus.ibft.messagewrappers; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.payload.CommitPayload; import org.hyperledger.besu.consensus.ibft.payload.PayloadDeserializers; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; import org.hyperledger.besu.crypto.SECP256K1.Signature; import org.hyperledger.besu.ethereum.core.Hash; import org.hyperledger.besu.ethereum.rlp.RLP; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/IbftMessage.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/IbftMessage.java index 96eb198e69..19ec23946a 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/IbftMessage.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/IbftMessage.java @@ -15,10 +15,10 @@ package org.hyperledger.besu.consensus.ibft.messagewrappers; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; -import org.hyperledger.besu.consensus.ibft.payload.Authored; -import org.hyperledger.besu.consensus.ibft.payload.Payload; -import org.hyperledger.besu.consensus.ibft.payload.RoundSpecific; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.consensus.common.bft.payload.Authored; +import org.hyperledger.besu.consensus.common.bft.payload.Payload; +import org.hyperledger.besu.consensus.common.bft.payload.RoundSpecific; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.ethereum.core.Address; import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Prepare.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Prepare.java index 917509de7a..acaac9264c 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Prepare.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Prepare.java @@ -14,9 +14,9 @@ */ package org.hyperledger.besu.consensus.ibft.messagewrappers; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.payload.PayloadDeserializers; import org.hyperledger.besu.consensus.ibft.payload.PreparePayload; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; import org.hyperledger.besu.ethereum.core.Hash; import org.hyperledger.besu.ethereum.rlp.RLP; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Proposal.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Proposal.java index 2b963d5833..c6cc21e914 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Proposal.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Proposal.java @@ -14,11 +14,11 @@ */ package org.hyperledger.besu.consensus.ibft.messagewrappers; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions; import org.hyperledger.besu.consensus.ibft.payload.PayloadDeserializers; import org.hyperledger.besu.consensus.ibft.payload.ProposalPayload; import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; import org.hyperledger.besu.ethereum.core.Block; import org.hyperledger.besu.ethereum.core.Hash; import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/RoundChange.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/RoundChange.java index 15644d49fa..e2e133cbd2 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/RoundChange.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/RoundChange.java @@ -15,11 +15,11 @@ package org.hyperledger.besu.consensus.ibft.messagewrappers; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions; import org.hyperledger.besu.consensus.ibft.payload.PayloadDeserializers; import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate; import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; import org.hyperledger.besu.ethereum.core.Block; import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; import org.hyperledger.besu.ethereum.rlp.RLP; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayload.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayload.java index 0cf784f4e4..cd069073d1 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayload.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayload.java @@ -15,6 +15,7 @@ package org.hyperledger.besu.consensus.ibft.payload; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.Payload; import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; import org.hyperledger.besu.crypto.SECP256K1.Signature; import org.hyperledger.besu.ethereum.core.Hash; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/MessageFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/MessageFactory.java index 7b828a646c..bf5bcb5d35 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/MessageFactory.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/MessageFactory.java @@ -15,6 +15,8 @@ package org.hyperledger.besu.consensus.ibft.payload; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.Payload; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PayloadDeserializers.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PayloadDeserializers.java index 1c3e68298d..b6839918a2 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PayloadDeserializers.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PayloadDeserializers.java @@ -14,6 +14,8 @@ */ package org.hyperledger.besu.consensus.ibft.payload; +import org.hyperledger.besu.consensus.common.bft.payload.Payload; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.crypto.SECP256K1.Signature; import org.hyperledger.besu.ethereum.core.Address; import org.hyperledger.besu.ethereum.core.Util; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayload.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayload.java index 449ed812cc..52188d19b4 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayload.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayload.java @@ -15,6 +15,7 @@ package org.hyperledger.besu.consensus.ibft.payload; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.Payload; import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; import org.hyperledger.besu.ethereum.core.Hash; import org.hyperledger.besu.ethereum.rlp.RLPInput; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificate.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificate.java index 0b8155b966..536101cb8a 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificate.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificate.java @@ -14,6 +14,7 @@ */ package org.hyperledger.besu.consensus.ibft.payload; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.ethereum.rlp.RLPInput; import org.hyperledger.besu.ethereum.rlp.RLPOutput; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayload.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayload.java index c114bf6b2b..15a4574b0d 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayload.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayload.java @@ -15,6 +15,7 @@ package org.hyperledger.besu.consensus.ibft.payload; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.Payload; import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; import org.hyperledger.besu.ethereum.core.Hash; import org.hyperledger.besu.ethereum.rlp.RLPInput; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificate.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificate.java index 5a4b45c9f2..8542a00f79 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificate.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificate.java @@ -14,6 +14,7 @@ */ package org.hyperledger.besu.consensus.ibft.payload; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; import org.hyperledger.besu.ethereum.rlp.RLPInput; import org.hyperledger.besu.ethereum.rlp.RLPOutput; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayload.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayload.java index 65ea092d3d..92b5bf061f 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayload.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayload.java @@ -15,6 +15,7 @@ package org.hyperledger.besu.consensus.ibft.payload; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.Payload; import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; import org.hyperledger.besu.ethereum.rlp.RLPInput; import org.hyperledger.besu.ethereum.rlp.RLPOutput; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManager.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManager.java index 79862361e9..32ff698933 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManager.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManager.java @@ -19,6 +19,7 @@ import static org.hyperledger.besu.consensus.ibft.statemachine.IbftBlockHeightMa import static org.hyperledger.besu.consensus.ibft.statemachine.IbftBlockHeightManager.MessageAge.PRIOR_ROUND; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.Payload; import org.hyperledger.besu.consensus.ibft.BlockTimer; import org.hyperledger.besu.consensus.ibft.ibftevent.RoundExpiry; import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; @@ -28,7 +29,6 @@ import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; import org.hyperledger.besu.consensus.ibft.network.IbftMessageTransmitter; import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; -import org.hyperledger.besu.consensus.ibft.payload.Payload; import org.hyperledger.besu.consensus.ibft.validation.FutureRoundProposalMessageValidator; import org.hyperledger.besu.consensus.ibft.validation.MessageValidatorFactory; import org.hyperledger.besu.ethereum.core.BlockHeader; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftController.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftController.java index cf9e36d59c..66046d1f65 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftController.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftController.java @@ -15,6 +15,7 @@ package org.hyperledger.besu.consensus.ibft.statemachine; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.Authored; import org.hyperledger.besu.consensus.ibft.Gossiper; import org.hyperledger.besu.consensus.ibft.MessageTracker; import org.hyperledger.besu.consensus.ibft.SynchronizerUpdater; @@ -28,7 +29,6 @@ import org.hyperledger.besu.consensus.ibft.messagedata.PrepareMessageData; import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData; import org.hyperledger.besu.consensus.ibft.messagedata.RoundChangeMessageData; import org.hyperledger.besu.consensus.ibft.messagewrappers.IbftMessage; -import org.hyperledger.besu.consensus.ibft.payload.Authored; import org.hyperledger.besu.ethereum.chain.Blockchain; import org.hyperledger.besu.ethereum.core.BlockHeader; import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifacts.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifacts.java index 169da27151..c9ada7dda9 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifacts.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifacts.java @@ -14,10 +14,10 @@ */ package org.hyperledger.besu.consensus.ibft.statemachine; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; import org.hyperledger.besu.ethereum.core.Block; import java.util.Collection; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidator.java index 724f534333..07d81c0e2f 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidator.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidator.java @@ -15,9 +15,9 @@ package org.hyperledger.besu.consensus.ibft.validation; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.IbftExtraData; import org.hyperledger.besu.consensus.ibft.payload.ProposalPayload; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; import org.hyperledger.besu.ethereum.core.Block; import org.apache.logging.log4j.LogManager; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidator.java index a60c039812..8d07f56834 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidator.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidator.java @@ -15,13 +15,13 @@ package org.hyperledger.besu.consensus.ibft.validation; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions; import org.hyperledger.besu.consensus.ibft.IbftBlockInterface; import org.hyperledger.besu.consensus.ibft.IbftHelpers; import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate; import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.validation.RoundChangePayloadValidator.MessageValidatorForHeightFactory; import org.hyperledger.besu.ethereum.core.Address; import org.hyperledger.besu.ethereum.core.Block; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangePayloadValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangePayloadValidator.java index 3dc9c905e4..e01ed98b93 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangePayloadValidator.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangePayloadValidator.java @@ -15,11 +15,11 @@ package org.hyperledger.besu.consensus.ibft.validation; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.payload.PreparePayload; import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate; import org.hyperledger.besu.consensus.ibft.payload.ProposalPayload; import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; import org.hyperledger.besu.ethereum.core.Address; import java.util.Collection; diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidator.java index 1a7b74d45e..85b5089daa 100644 --- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidator.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidator.java @@ -15,11 +15,11 @@ package org.hyperledger.besu.consensus.ibft.validation; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.Payload; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.payload.CommitPayload; -import org.hyperledger.besu.consensus.ibft.payload.Payload; import org.hyperledger.besu.consensus.ibft.payload.PreparePayload; import org.hyperledger.besu.consensus.ibft.payload.ProposalPayload; -import org.hyperledger.besu.consensus.ibft.payload.SignedData; import org.hyperledger.besu.ethereum.core.Address; import org.hyperledger.besu.ethereum.core.Hash; import org.hyperledger.besu.ethereum.core.Util; diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificateTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificateTest.java index 93a1bb4e5e..513d6d79ed 100644 --- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificateTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificateTest.java @@ -18,6 +18,7 @@ import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.TestHelpers; import org.hyperledger.besu.crypto.SECP256K1.Signature; import org.hyperledger.besu.ethereum.core.AddressHelpers; diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificateTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificateTest.java index bd834de562..23a957325f 100644 --- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificateTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificateTest.java @@ -18,6 +18,7 @@ import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.TestHelpers; import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; import org.hyperledger.besu.crypto.SECP256K1.Signature; diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayloadTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayloadTest.java index 55486e31b8..06b68f43cd 100644 --- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayloadTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayloadTest.java @@ -19,6 +19,7 @@ import static java.util.Optional.empty; import static org.assertj.core.api.Assertions.assertThat; import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.common.bft.payload.SignedData; import org.hyperledger.besu.consensus.ibft.TestHelpers; import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; import org.hyperledger.besu.crypto.SECP256K1.Signature;