remove sp-std

Cargo.toml

@@ -465,7 +465,6 @@ members = [
 	"substrate/primitives/staking",
 	"substrate/primitives/state-machine",
 	"substrate/primitives/statement-store",
-	"substrate/primitives/std",
 	"substrate/primitives/storage",
 	"substrate/primitives/test-primitives",
 	"substrate/primitives/timestamp",

bridges/bin/runtime-common/Cargo.toml

@@ -42,7 +42,6 @@ sp-api = { path = "../../../substrate/primitives/api", default-features = false
 sp-core = { path = "../../../substrate/primitives/core", default-features = false }
 sp-io = { path = "../../../substrate/primitives/io", default-features = false }
 sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
 
 # Polkadot dependencies
@@ -80,7 +79,6 @@ std = [
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"sp-std/std",
 	"sp-trie/std",
 	"xcm-builder/std",
 	"xcm/std",

bridges/bin/runtime-common/src/lib.rs

@@ -19,6 +19,8 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
+extern crate alloc;
+
 use crate::messages_call_ext::MessagesCallSubType;
 use pallet_bridge_grandpa::CallSubType as GrandpaCallSubType;
 use pallet_bridge_parachains::CallSubType as ParachainsCallSubtype;
@@ -112,7 +114,7 @@ macro_rules! generate_bridge_reject_obsolete_headers_and_messages {
 			type AdditionalSigned = ();
 			type Pre = ();
 
-			fn additional_signed(&self) -> sp_std::result::Result<
+			fn additional_signed(&self) -> core::result::Result<
 				(),
 				sp_runtime::transaction_validity::TransactionValidityError,
 			> {

bridges/bin/runtime-common/src/messages.rs

@@ -22,6 +22,7 @@
 
 pub use bp_runtime::{RangeInclusiveExt, UnderlyingChainOf, UnderlyingChainProvider};
 
+use alloc::vec::Vec;
 use bp_header_chain::HeaderChain;
 use bp_messages::{
 	source_chain::TargetHeaderChain,
@@ -31,11 +32,11 @@ use bp_messages::{
 };
 use bp_runtime::{Chain, RawStorageProof, Size, StorageProofChecker};
 use codec::{Decode, Encode};
+use core::{marker::PhantomData};
 use frame_support::{traits::Get, weights::Weight};
 use hash_db::Hasher;
 use scale_info::TypeInfo;
 use sp_runtime::RuntimeDebug;
-use sp_std::{convert::TryFrom, marker::PhantomData, vec::Vec};
 
 /// Bidirectional message bridge.
 pub trait MessageBridge {
@@ -340,7 +341,7 @@ pub mod target {
 
 	struct StorageProofCheckerAdapter<H: Hasher, B> {
 		storage: StorageProofChecker<H>,
-		_dummy: sp_std::marker::PhantomData<B>,
+		_dummy: core::marker::PhantomData<B>,
 	}
 
 	impl<H: Hasher, B: MessageBridge> StorageProofCheckerAdapter<H, B> {

bridges/bin/runtime-common/src/messages_api.rs

@@ -16,10 +16,11 @@
 
 //! Helpers for implementing various message-related runtime API methods.
 
+#[cfg(not(feature = "std"))]
+use alloc::vec::Vec;
 use bp_messages::{
 	InboundMessageDetails, LaneId, MessageNonce, MessagePayload, OutboundMessageDetails,
 };
-use sp_std::vec::Vec;
 
 /// Implementation of the `To*OutboundLaneApi::message_details`.
 pub fn outbound_message_details<Runtime, MessagesPalletInstance>(

bridges/bin/runtime-common/src/messages_benchmarking.rs

@@ -30,14 +30,14 @@ use crate::{
 	},
 };
 
+use alloc::vec;
 use bp_messages::MessagePayload;
 use bp_polkadot_core::parachains::ParaHash;
 use bp_runtime::{Chain, Parachain, StorageProofSize, UnderlyingChainOf};
 use codec::Encode;
 use frame_support::weights::Weight;
 use pallet_bridge_messages::benchmarking::{MessageDeliveryProofParams, MessageProofParams};
 use sp_runtime::traits::{Header, Zero};
-use sp_std::prelude::*;
 use xcm::latest::prelude::*;
 
 /// Prepare inbound bridge message according to given message proof parameters.

bridges/bin/runtime-common/src/messages_call_ext.rs

@@ -22,13 +22,13 @@ use crate::messages::{
 };
 use bp_messages::{target_chain::MessageDispatch, InboundLaneData, LaneId, MessageNonce};
 use bp_runtime::OwnedBridgeModule;
+use core::ops::RangeInclusive;
 use frame_support::{
 	dispatch::CallableCallFor,
 	traits::{Get, IsSubType},
 };
 use pallet_bridge_messages::{Config, Pallet};
 use sp_runtime::{transaction_validity::TransactionValidity, RuntimeDebug};
-use sp_std::ops::RangeInclusive;
 
 /// Generic info about a messages delivery/confirmation proof.
 #[derive(PartialEq, RuntimeDebug)]
@@ -137,7 +137,7 @@ impl CallInfo {
 
 /// Helper struct that provides methods for working with a call supported by `CallInfo`.
 pub struct CallHelper<T: Config<I>, I: 'static> {
-	_phantom_data: sp_std::marker::PhantomData<(T, I)>,
+	_phantom_data: core::marker::PhantomData<(T, I)>,
 }
 
 impl<T: Config<I>, I: 'static> CallHelper<T, I> {
@@ -368,7 +368,7 @@ mod tests {
 		},
 	};
 	use bp_messages::{DeliveredMessages, UnrewardedRelayer, UnrewardedRelayersState};
-	use sp_std::ops::RangeInclusive;
+	use core::ops::RangeInclusive;
 
 	fn fill_unrewarded_relayers() {
 		let mut inbound_lane_state =

bridges/bin/runtime-common/src/messages_generation.rs

@@ -18,13 +18,15 @@
 
 use crate::messages::{AccountIdOf, BridgedChain, HashOf, HasherOf, MessageBridge, ThisChain};
 
+#[cfg(not(feature = "std"))]
+use alloc::vec::Vec;
 use bp_messages::{
 	storage_keys, InboundLaneData, LaneId, MessageKey, MessageNonce, MessagePayload,
 	OutboundLaneData,
 };
 use bp_runtime::{record_all_trie_keys, RawStorageProof, StorageProofSize};
 use codec::Encode;
-use sp_std::{ops::RangeInclusive, prelude::*};
+use core::ops::RangeInclusive;
 use sp_trie::{trie_types::TrieDBMutBuilderV1, LayoutV1, MemoryDB, TrieMut};
 
 /// Simple and correct message data encode function.
@@ -142,7 +144,7 @@ pub fn grow_trie_leaf_value(mut value: Vec<u8>, size: StorageProofSize) -> Vec<u
 	match size {
 		StorageProofSize::Minimal(_) => (),
 		StorageProofSize::HasLargeLeaf(size) if size as usize > value.len() => {
-			value.extend(sp_std::iter::repeat(42u8).take(size as usize - value.len()));
+			value.extend(core::iter::repeat(42u8).take(size as usize - value.len()));
 		},
 		StorageProofSize::HasLargeLeaf(_) => (),
 	}

bridges/bin/runtime-common/src/messages_xcm_extension.rs

@@ -30,13 +30,13 @@ use bp_runtime::messages::MessageDispatchResult;
 pub use bp_xcm_bridge_hub::XcmAsPlainPayload;
 use bp_xcm_bridge_hub_router::XcmChannelStatusProvider;
 use codec::{Decode, Encode};
+use core::{fmt::Debug, marker::PhantomData};
 use frame_support::{traits::Get, weights::Weight, CloneNoBound, EqNoBound, PartialEqNoBound};
 use pallet_bridge_messages::{
 	Config as MessagesConfig, OutboundLanesCongestedSignals, WeightInfoExt as MessagesPalletWeights,
 };
 use scale_info::TypeInfo;
 use sp_runtime::SaturatedConversion;
-use sp_std::{fmt::Debug, marker::PhantomData};
 use xcm::prelude::*;
 use xcm_builder::{DispatchBlob, DispatchBlobError};
 
@@ -55,7 +55,7 @@ pub enum XcmBlobMessageDispatchResult {
 ///
 /// It needs to be used at the target bridge hub.
 pub struct XcmBlobMessageDispatch<DispatchBlob, Weights, Channel> {
-	_marker: sp_std::marker::PhantomData<(DispatchBlob, Weights, Channel)>,
+	_marker: core::marker::PhantomData<(DispatchBlob, Weights, Channel)>,
 }
 
 impl<
@@ -166,12 +166,12 @@ pub trait XcmBlobHauler {
 ///
 /// It needs to be used at the source bridge hub.
 pub struct XcmBlobHaulerAdapter<XcmBlobHauler, Lanes>(
-	sp_std::marker::PhantomData<(XcmBlobHauler, Lanes)>,
+	core::marker::PhantomData<(XcmBlobHauler, Lanes)>,
 );
 
 impl<
 		H: XcmBlobHauler,
-		Lanes: Get<sp_std::vec::Vec<(SenderAndLane, (NetworkId, InteriorLocation))>>,
+		Lanes: Get<alloc::vec::Vec<(SenderAndLane, (NetworkId, InteriorLocation))>>,
 	> OnMessagesDelivered for XcmBlobHaulerAdapter<H, Lanes>
 {
 	fn on_messages_delivered(lane: LaneId, enqueued_messages: MessageNonce) {
@@ -316,7 +316,7 @@ impl<H: XcmBlobHauler> LocalXcmQueueManager<H> {
 /// configured XCM version between the destination `dest` and the bridge hub location provided as
 /// `Get<Location>`.
 pub struct XcmVersionOfDestAndRemoteBridge<Version, RemoteBridge>(
-	sp_std::marker::PhantomData<(Version, RemoteBridge)>,
+	core::marker::PhantomData<(Version, RemoteBridge)>,
 );
 impl<Version: GetVersion, RemoteBridge: Get<Location>> GetVersion
 	for XcmVersionOfDestAndRemoteBridge<Version, RemoteBridge>
@@ -326,7 +326,7 @@ impl<Version: GetVersion, RemoteBridge: Get<Location>> GetVersion
 		let bridge_hub_version = Version::get_version_for(&RemoteBridge::get());
 
 		match (dest_version, bridge_hub_version) {
-			(Some(dv), Some(bhv)) => Some(sp_std::cmp::min(dv, bhv)),
+			(Some(dv), Some(bhv)) => Some(core::cmp::min(dv, bhv)),
 			(Some(dv), None) => Some(dv),
 			(None, Some(bhv)) => Some(bhv),
 			(None, None) => None,
@@ -348,7 +348,7 @@ mod tests {
 			location: Location::new(1, [Parachain(1000)]),
 			lane: TEST_LANE_ID,
 		};
-		pub TestLanes: sp_std::vec::Vec<(SenderAndLane, (NetworkId, InteriorLocation))> = sp_std::vec![
+		pub TestLanes: alloc::vec::Vec<(SenderAndLane, (NetworkId, InteriorLocation))> = alloc::vec![
 			(TestSenderAndLane::get(), (NetworkId::ByGenesis([0; 32]), InteriorLocation::Here))
 		];
 		pub DummyXcmMessage: Xcm<()> = Xcm::new();

bridges/bin/runtime-common/src/parachains_benchmarking.rs

@@ -23,13 +23,14 @@ use crate::{
 	messages_generation::grow_trie_leaf_value,
 };
 
+#[cfg(not(feature = "std"))]
+use alloc::{vec, vec::Vec};
 use bp_parachains::parachain_head_storage_key_at_source;
 use bp_polkadot_core::parachains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
 use bp_runtime::{record_all_trie_keys, StorageProofSize};
 use codec::Encode;
 use frame_support::traits::Get;
 use pallet_bridge_parachains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumber};
-use sp_std::prelude::*;
 use sp_trie::{trie_types::TrieDBMutBuilderV1, LayoutV1, MemoryDB, TrieMut};
 
 /// Prepare proof of messages for the `receive_messages_proof` call.

bridges/bin/runtime-common/src/refund_relayer_extension.rs

@@ -22,10 +22,13 @@
 use crate::messages_call_ext::{
 	CallHelper as MessagesCallHelper, CallInfo as MessagesCallInfo, MessagesCallSubType,
 };
+#[cfg(not(feature = "std"))]
+use alloc::{vec, vec::Vec};
 use bp_messages::{LaneId, MessageNonce};
 use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
 use bp_runtime::{Chain, Parachain, ParachainIdOf, RangeInclusiveExt, StaticStrProvider};
 use codec::{Codec, Decode, Encode};
+use core::marker::PhantomData;
 use frame_support::{
 	dispatch::{CallableCallFor, DispatchInfo, PostDispatchInfo},
 	traits::IsSubType,
@@ -54,7 +57,6 @@ use sp_runtime::{
 	},
 	DispatchResult, FixedPointOperand, RuntimeDebug,
 };
-use sp_std::{marker::PhantomData, vec, vec::Vec};
 
 type AccountIdOf<R> = <R as frame_system::Config>::AccountId;
 // without this typedef rustfmt fails with internal err
@@ -241,7 +243,7 @@ pub enum RelayerAccountAction<AccountId, Reward> {
 
 /// Everything common among our refund signed extensions.
 pub trait RefundSignedExtension:
-	'static + Clone + Codec + sp_std::fmt::Debug + Default + Eq + PartialEq + Send + Sync + TypeInfo
+	'static + Clone + Codec + core::fmt::Debug + Default + Eq + PartialEq + Send + Sync + TypeInfo
 where
 	<Self::Runtime as GrandpaConfig<Self::GrandpaInstance>>::BridgedChain:
 		Chain<BlockNumber = RelayBlockNumber>,

bridges/chains/chain-bridge-hub-cumulus/Cargo.toml

@@ -22,7 +22,6 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false }
 frame-system = { path = "../../../substrate/frame/system", default-features = false }
 frame-support = { path = "../../../substrate/frame/support", default-features = false }
 sp-api = { path = "../../../substrate/primitives/api", default-features = false }
-sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 # Polkadot Dependencies
 polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false }
@@ -37,5 +36,4 @@ std = [
 	"frame-system/std",
 	"polkadot-primitives/std",
 	"sp-api/std",
-	"sp-std/std",
 ]

bridges/chains/chain-bridge-hub-cumulus/src/lib.rs

@@ -30,14 +30,14 @@ use bp_polkadot_core::SuffixedCommonSignedExtension;
 use bp_runtime::extensions::{
 	BridgeRejectObsoleteHeadersAndMessages, RefundBridgedParachainMessagesSchema,
 };
+use core::time::Duration;
 use frame_support::{
 	dispatch::DispatchClass,
 	parameter_types,
 	sp_runtime::{MultiAddress, MultiSigner},
 	weights::constants,
 };
 use frame_system::limits;
-use sp_std::time::Duration;
 
 /// Average block interval in Cumulus-based parachains.
 ///

bridges/chains/chain-bridge-hub-kusama/Cargo.toml

@@ -22,7 +22,6 @@ bp-messages = { path = "../../primitives/messages", default-features = false }
 frame-support = { path = "../../../substrate/frame/support", default-features = false }
 sp-api = { path = "../../../substrate/primitives/api", default-features = false }
 sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
 default = ["std"]
@@ -33,5 +32,4 @@ std = [
 	"frame-support/std",
 	"sp-api/std",
 	"sp-runtime/std",
-	"sp-std/std",
 ]

bridges/chains/chain-bridge-hub-kusama/src/lib.rs

@@ -20,6 +20,8 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
+extern crate alloc;
+
 pub use bp_bridge_hub_cumulus::*;
 use bp_messages::*;
 use bp_runtime::{

bridges/chains/chain-bridge-hub-polkadot/Cargo.toml

@@ -23,7 +23,6 @@ bp-messages = { path = "../../primitives/messages", default-features = false }
 frame-support = { path = "../../../substrate/frame/support", default-features = false }
 sp-api = { path = "../../../substrate/primitives/api", default-features = false }
 sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
 default = ["std"]
@@ -34,5 +33,4 @@ std = [
 	"frame-support/std",
 	"sp-api/std",
 	"sp-runtime/std",
-	"sp-std/std",
 ]

bridges/chains/chain-bridge-hub-polkadot/src/lib.rs

@@ -20,6 +20,8 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
+extern crate alloc;
+
 pub use bp_bridge_hub_cumulus::*;
 use bp_messages::*;
 use bp_runtime::{

bridges/chains/chain-bridge-hub-rococo/Cargo.toml

@@ -22,7 +22,6 @@ bp-messages = { path = "../../primitives/messages", default-features = false }
 frame-support = { path = "../../../substrate/frame/support", default-features = false }
 sp-api = { path = "../../../substrate/primitives/api", default-features = false }
 sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
 default = ["std"]
@@ -33,5 +32,4 @@ std = [
 	"frame-support/std",
 	"sp-api/std",
 	"sp-runtime/std",
-	"sp-std/std",
 ]

bridges/chains/chain-bridge-hub-rococo/src/lib.rs

@@ -20,6 +20,8 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
+extern crate alloc;
+
 pub use bp_bridge_hub_cumulus::*;
 use bp_messages::*;
 use bp_runtime::{

bridges/chains/chain-bridge-hub-westend/Cargo.toml

@@ -23,7 +23,6 @@ bp-messages = { path = "../../primitives/messages", default-features = false }
 frame-support = { path = "../../../substrate/frame/support", default-features = false }
 sp-api = { path = "../../../substrate/primitives/api", default-features = false }
 sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
 default = ["std"]
@@ -34,5 +33,4 @@ std = [
 	"frame-support/std",
 	"sp-api/std",
 	"sp-runtime/std",
-	"sp-std/std",
 ]

bridges/chains/chain-bridge-hub-westend/src/lib.rs

@@ -19,6 +19,8 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+extern crate alloc;
+
 pub use bp_bridge_hub_cumulus::*;
 use bp_messages::*;
 use bp_runtime::{