fix the fix

Signed-off-by: Andrei Sandu <[email protected]>

cumulus/client/consensus/aura/src/collators/mod.rs

@@ -30,8 +30,8 @@ use cumulus_primitives_core::{relay_chain::Hash as ParaHash, BlockT, ClaimQueueO
 use cumulus_relay_chain_interface::RelayChainInterface;
 use polkadot_node_subsystem_util::runtime::ClaimQueueSnapshot;
 use polkadot_primitives::{
-	AsyncBackingParams, CoreIndex, Hash as RelayHash, Id as ParaId,
-	OccupiedCoreAssumption, ValidationCodeHash,
+	AsyncBackingParams, CoreIndex, Hash as RelayHash, Id as ParaId, OccupiedCoreAssumption,
+	ValidationCodeHash,
 };
 use sc_consensus_aura::{standalone as aura_internal, AuraApi};
 use sp_api::ProvideRuntimeApi;

cumulus/client/pov-recovery/src/tests.rs

@@ -18,7 +18,7 @@ use super::*;
 use assert_matches::assert_matches;
 use codec::{Decode, Encode};
 use cumulus_primitives_core::relay_chain::{
-	vstaging::CoreState, BlockId, CandidateCommitments, CandidateDescriptor,
+	vstaging::CoreState, BlockId, CandidateCommitments, CandidateDescriptor, CoreIndex,
 };
 use cumulus_relay_chain_interface::{
 	InboundDownwardMessage, InboundHrmpMessage, OccupiedCoreAssumption, PHash, PHeader,
@@ -29,7 +29,7 @@ use cumulus_test_client::{
 	Sr25519Keyring,
 };
 use futures::{channel::mpsc, SinkExt};
-use polkadot_node_primitives::{CoreIndex, AvailableData};
+use polkadot_node_primitives::AvailableData;
 use polkadot_node_subsystem::{messages::AvailabilityRecoveryMessage, RecoveryError, TimeoutExt};
 use rstest::rstest;
 use sc_client_api::{

cumulus/client/relay-chain-inprocess-interface/src/lib.rs

@@ -26,9 +26,8 @@ use cumulus_primitives_core::{
 	relay_chain::{
 		runtime_api::ParachainHost,
 		vstaging::{CommittedCandidateReceiptV2 as CommittedCandidateReceipt, CoreState},
-		Block as PBlock, BlockId, BlockNumber, Hash as PHash, Header as PHeader,
+		Block as PBlock, BlockId, BlockNumber, CoreIndex, Hash as PHash, Header as PHeader,
 		InboundHrmpMessage, OccupiedCoreAssumption, SessionIndex, ValidationCodeHash, ValidatorId,
-		CoreIndex,
 	},
 	InboundDownwardMessage, ParaId, PersistedValidationData,
 };

cumulus/client/relay-chain-interface/src/lib.rs

@@ -34,8 +34,8 @@ use cumulus_primitives_core::relay_chain::{BlockId, Hash as RelayHash};
 pub use cumulus_primitives_core::{
 	relay_chain::{
 		vstaging::{CommittedCandidateReceiptV2 as CommittedCandidateReceipt, CoreState},
-		BlockNumber, Hash as PHash, Header as PHeader, InboundHrmpMessage, OccupiedCoreAssumption,
-		SessionIndex, ValidationCodeHash, ValidatorId, CoreIndex,
+		BlockNumber, CoreIndex, Hash as PHash, Header as PHeader, InboundHrmpMessage,
+		OccupiedCoreAssumption, SessionIndex, ValidationCodeHash, ValidatorId,
 	},
 	InboundDownwardMessage, ParaId, PersistedValidationData,
 };