Comanion for substrate#11136

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

@@ -42,10 +42,7 @@ use sp_runtime::{
 	traits::{AtLeast32BitUnsigned, CheckedAdd, CheckedDiv, CheckedMul, Saturating, Zero},
 	FixedPointNumber, FixedPointOperand, FixedU128,
 };
-use sp_std::{
-	cmp::PartialOrd, convert::TryFrom, fmt::Debug, marker::PhantomData, ops::RangeInclusive,
-	vec::Vec,
-};
+use sp_std::{cmp::PartialOrd, fmt::Debug, marker::PhantomData, ops::RangeInclusive, vec::Vec};
 use sp_trie::StorageProof;
 
 /// Bidirectional message bridge.

bridges/modules/grandpa/src/lib.rs

@@ -45,7 +45,7 @@ use frame_support::{ensure, fail};
 use frame_system::{ensure_signed, RawOrigin};
 use sp_finality_grandpa::{ConsensusLog, GRANDPA_ENGINE_ID};
 use sp_runtime::traits::{BadOrigin, Header as HeaderT, Zero};
-use sp_std::{boxed::Box, convert::TryInto};
+use sp_std::boxed::Box;
 
 #[cfg(test)]
 mod mock;

bridges/modules/messages/src/benchmarking.rs

@@ -30,7 +30,7 @@ use bp_runtime::messages::DispatchFeePayment;
 use frame_benchmarking::{account, benchmarks_instance_pallet};
 use frame_support::{traits::Get, weights::Weight};
 use frame_system::RawOrigin;
-use sp_std::{collections::vec_deque::VecDeque, convert::TryInto, ops::RangeInclusive, prelude::*};
+use sp_std::{collections::vec_deque::VecDeque, ops::RangeInclusive, prelude::*};
 
 const SEED: u32 = 0;
 

bridges/primitives/runtime/src/chain.rs

@@ -24,7 +24,7 @@ use sp_runtime::{
 	},
 	FixedPointOperand,
 };
-use sp_std::{convert::TryFrom, fmt::Debug, hash::Hash, str::FromStr, vec, vec::Vec};
+use sp_std::{fmt::Debug, hash::Hash, str::FromStr, vec, vec::Vec};
 
 /// Chain call, that is either SCALE-encoded, or decoded.
 #[derive(Debug, Clone, PartialEq)]

bridges/primitives/runtime/src/lib.rs

@@ -22,7 +22,7 @@ use codec::Encode;
 use frame_support::{RuntimeDebug, StorageHasher};
 use sp_core::{hash::H256, storage::StorageKey};
 use sp_io::hashing::blake2_256;
-use sp_std::{convert::TryFrom, vec, vec::Vec};
+use sp_std::{vec, vec::Vec};
 
 pub use chain::{
 	AccountIdOf, AccountPublicOf, BalanceOf, BlockNumberOf, Chain, EncodedOrDecodedCall, HashOf,

bridges/primitives/test-utils/src/lib.rs

@@ -20,7 +20,6 @@
 
 use bp_header_chain::justification::GrandpaJustification;
 use codec::Encode;
-use sp_application_crypto::TryFrom;
 use sp_finality_grandpa::{AuthorityId, AuthoritySignature, AuthorityWeight, SetId};
 use sp_runtime::traits::{Header as HeaderT, One, Zero};
 use sp_std::prelude::*;

bridges/relays/bin-substrate/src/cli/mod.rs

@@ -16,8 +16,6 @@
 
 //! Deal with CLI args of substrate-to-substrate relay.
 
-use std::convert::TryInto;
-
 use codec::{Decode, Encode};
 use relay_substrate_client::ChainRuntimeVersion;
 use sp_runtime::app_crypto::Ss58Codec;

bridges/relays/bin-substrate/src/cli/reinit_bridge.rs

@@ -36,7 +36,6 @@ use relay_substrate_client::{
 	SyncHeader, TransactionEra, TransactionSignScheme, UnsignedTransaction,
 };
 use sp_core::{Bytes, Pair};
-use std::convert::{TryFrom, TryInto};
 use structopt::StructOpt;
 use strum::{EnumString, EnumVariantNames, VariantNames};
 use substrate_relay_helper::{

bridges/relays/client-substrate/src/client.rs

@@ -47,7 +47,7 @@ use sp_runtime::{
 };
 use sp_trie::StorageProof;
 use sp_version::RuntimeVersion;
-use std::{convert::TryFrom, future::Future};
+use std::future::Future;
 
 const SUB_API_GRANDPA_AUTHORITIES: &str = "GrandpaApi_grandpa_authorities";
 const SUB_API_TXPOOL_VALIDATE_TRANSACTION: &str = "TaggedTransactionQueue_validate_transaction";

bridges/relays/lib-substrate-relay/src/messages_lane.rs

@@ -40,7 +40,7 @@ use relay_substrate_client::{
 };
 use relay_utils::metrics::MetricsParams;
 use sp_core::Pair;
-use std::{convert::TryFrom, fmt::Debug, marker::PhantomData};
+use std::{fmt::Debug, marker::PhantomData};
 
 /// Substrate -> Substrate messages synchronization pipeline.
 pub trait SubstrateMessageLane: 'static + Clone + Debug + Send + Sync {

bridges/relays/lib-substrate-relay/src/messages_metrics.rs

@@ -32,7 +32,7 @@ use relay_utils::metrics::{
 };
 use sp_core::storage::StorageData;
 use sp_runtime::{FixedPointNumber, FixedU128};
-use std::{convert::TryFrom, fmt::Debug, marker::PhantomData};
+use std::{fmt::Debug, marker::PhantomData};
 
 /// Name of the `NextFeeMultiplier` storage value within the transaction payment pallet.
 const NEXT_FEE_MULTIPLIER_VALUE_NAME: &str = "NextFeeMultiplier";

bridges/relays/lib-substrate-relay/src/messages_target.rs

@@ -49,7 +49,7 @@ use relay_substrate_client::{
 use relay_utils::{relay_loop::Client as RelayClient, HeaderId};
 use sp_core::{Bytes, Pair};
 use sp_runtime::{traits::Saturating, FixedPointNumber, FixedU128};
-use std::{collections::VecDeque, convert::TryFrom, ops::RangeInclusive};
+use std::{collections::VecDeque, ops::RangeInclusive};
 
 /// Message receiving proof returned by the target Substrate node.
 pub type SubstrateMessagesDeliveryProof<C> =

cli/src/command.rs

@@ -25,7 +25,7 @@ use std::net::ToSocketAddrs;
 pub use crate::{error::Error, service::BlockId};
 pub use polkadot_performance_test::PerfCheckError;
 
-impl std::convert::From<String> for Error {
+impl From<String> for Error {
 	fn from(s: String) -> Self {
 		Self::Other(s)
 	}

erasure-coding/src/lib.rs

@@ -24,8 +24,6 @@
 //! f is the maximum number of faulty validators in the system.
 //! The data is coded so any f+1 chunks can be used to reconstruct the full data.
 
-use std::convert::TryFrom;
-
 use parity_scale_codec::{Decode, Encode};
 use polkadot_node_primitives::{AvailableData, Proof};
 use polkadot_primitives::v2::{BlakeTwo256, Hash as H256, HashT};

node/core/approval-voting/src/import.rs

@@ -54,7 +54,7 @@ use sp_consensus_slots::Slot;
 use bitvec::order::Lsb0 as BitOrderLsb0;
 use futures::{channel::oneshot, prelude::*};
 
-use std::{collections::HashMap, convert::TryFrom};
+use std::collections::HashMap;
 
 use super::approval_db::v1;
 use crate::{

node/core/approval-voting/src/ops.rs

@@ -22,10 +22,7 @@ use polkadot_node_subsystem::SubsystemResult;
 use bitvec::order::Lsb0 as BitOrderLsb0;
 use polkadot_primitives::v2::{BlockNumber, CandidateHash, CandidateReceipt, GroupIndex, Hash};
 
-use std::{
-	collections::{hash_map::Entry, BTreeMap, HashMap},
-	convert::Into,
-};
+use std::collections::{hash_map::Entry, BTreeMap, HashMap};
 
 use super::{
 	approval_db::v1::{OurAssignment, StoredBlockRange},

node/core/av-store/src/metrics.rs

@@ -35,7 +35,6 @@ pub struct Metrics(Option<MetricsInner>);
 impl Metrics {
 	pub(crate) fn on_chunks_received(&self, count: usize) {
 		if let Some(metrics) = &self.0 {
-			use core::convert::TryFrom as _;
 			// assume usize fits into u64
 			let by = u64::try_from(count).unwrap_or_default();
 			metrics.received_availability_chunks_total.inc_by(by);

node/core/av-store/src/tests.rs

@@ -16,8 +16,6 @@
 
 use super::*;
 
-use std::convert::TryFrom;
-
 use assert_matches::assert_matches;
 use futures::{channel::oneshot, executor, future, Future};
 

node/core/backing/src/tests.rs

@@ -1456,7 +1456,6 @@ fn validation_work_ignores_wrong_collator() {
 #[test]
 fn candidate_backing_reorders_votes() {
 	use sp_core::Encode;
-	use std::convert::TryFrom;
 
 	let para_id = ParaId::from(10);
 	let validators = vec![

node/core/provisioner/src/metrics.rs

@@ -15,7 +15,6 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use polkadot_node_subsystem_util::metrics::{self, prometheus};
-use std::convert::TryInto;
 
 #[derive(Clone)]
 struct MetricsInner {

node/metrics/src/tests.rs

@@ -21,7 +21,7 @@ use polkadot_test_service::{node_config, run_validator_node, test_prometheus_con
 use primitives::v2::metric_definitions::PARACHAIN_INHERENT_DATA_BITFIELDS_PROCESSED;
 use sc_client_api::{execution_extensions::ExecutionStrategies, ExecutionStrategy};
 use sp_keyring::AccountKeyring::*;
-use std::{collections::HashMap, convert::TryFrom};
+use std::collections::HashMap;
 
 const DEFAULT_PROMETHEUS_PORT: u16 = 9616;
 

node/network/availability-distribution/src/requester/fetch_task/tests.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::{collections::HashMap, convert::TryFrom};
+use std::collections::HashMap;
 
 use parity_scale_codec::Encode;
 

node/network/availability-distribution/src/tests/mock.rs

@@ -16,7 +16,7 @@
 
 //! Helper functions and tools to generate mock data useful for testing this subsystem.
 
-use std::{convert::TryFrom, sync::Arc};
+use std::sync::Arc;
 
 use sp_keyring::Sr25519Keyring;
 

node/network/availability-recovery/src/lib.rs

@@ -20,7 +20,6 @@
 
 use std::{
 	collections::{HashMap, VecDeque},
-	convert::TryFrom,
 	pin::Pin,
 	time::Duration,
 };

node/network/availability-recovery/src/tests.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::{convert::TryFrom, sync::Arc, time::Duration};
+use std::{sync::Arc, time::Duration};
 
 use assert_matches::assert_matches;
 use futures::{executor, future};

node/network/protocol/src/lib.rs

@@ -282,7 +282,6 @@ impl View {
 /// v1 protocol types.
 pub mod v1 {
 	use parity_scale_codec::{Decode, Encode};
-	use std::convert::TryFrom;
 
 	use polkadot_primitives::v2::{
 		CandidateHash, CandidateIndex, CollatorId, CollatorSignature, CompactStatement, Hash,

node/primitives/src/disputes/mod.rs

@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::convert::TryInto;
-
 use parity_scale_codec::{Decode, Encode};
 
 use sp_application_crypto::AppKey;

node/primitives/src/lib.rs

@@ -22,7 +22,7 @@
 
 #![deny(missing_docs)]
 
-use std::{convert::TryFrom, pin::Pin, time::Duration};
+use std::{pin::Pin, time::Duration};
 
 use bounded_vec::BoundedVec;
 use futures::Future;

node/subsystem-types/src/messages/network_bridge_event.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::{collections::HashSet, convert::TryFrom};
+use std::collections::HashSet;
 
 pub use sc_network::{PeerId, ReputationChange};
 

node/subsystem-util/src/lib.rs

@@ -61,7 +61,6 @@ use sp_core::{traits::SpawnNamed, ByteArray};
 use sp_keystore::{CryptoStore, Error as KeystoreError, SyncCryptoStorePtr};
 use std::{
 	collections::{hash_map::Entry, HashMap},
-	convert::TryFrom,
 	fmt,
 	marker::Unpin,
 	pin::Pin,

primitives/src/v2/signed.rs

@@ -21,8 +21,6 @@ use scale_info::TypeInfo;
 use application_crypto::AppKey;
 #[cfg(feature = "std")]
 use sp_keystore::{CryptoStore, Error as KeystoreError, SyncCryptoStorePtr};
-#[cfg(feature = "std")]
-use sp_std::convert::TryInto;
 use sp_std::prelude::Vec;
 
 use primitives::RuntimeDebug;

runtime/common/slot_range_helper/src/lib.rs

@@ -22,7 +22,7 @@ pub use enumn::N;
 pub use parity_scale_codec::{Decode, Encode};
 pub use paste;
 pub use sp_runtime::traits::CheckedSub;
-pub use sp_std::{convert::TryInto, ops::Add, result};
+pub use sp_std::{ops::Add, result};
 
 /// This macro generates a `SlotRange` enum of arbitrary length for use in the Slot Auction
 /// mechanism on Polkadot.
@@ -168,7 +168,7 @@ macro_rules! generate_slot_range_new_bounded {
 		///
 		/// For example: `SlotRange::new_bounded(1, 2, 3) == SlotRange::OneTwo`.
 		pub fn new_bounded<
-			Index: $crate::Add<Output=Index> + $crate::CheckedSub + Copy + Ord + From<u32> + $crate::TryInto<u32>
+			Index: $crate::Add<Output=Index> + $crate::CheckedSub + Copy + Ord + From<u32> + TryInto<u32>
 		>(
 			current: Index,
 			first: Index,

runtime/common/src/crowdloan/mod.rs

@@ -826,7 +826,7 @@ mod crypto {
 	use sp_core::ed25519;
 	use sp_io::crypto::{ed25519_generate, ed25519_sign};
 	use sp_runtime::{MultiSignature, MultiSigner};
-	use sp_std::{convert::TryFrom, vec::Vec};
+	use sp_std::vec::Vec;
 
 	pub fn create_ed25519_pubkey(seed: Vec<u8>) -> MultiSigner {
 		ed25519_generate(0.into(), Some(seed)).into()

runtime/common/src/integration_tests.rs

@@ -44,7 +44,7 @@ use sp_runtime::{
 	transaction_validity::TransactionPriority,
 	AccountId32,
 };
-use sp_std::{convert::TryInto, sync::Arc};
+use sp_std::sync::Arc;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;

runtime/parachains/src/builder.rs

@@ -35,7 +35,7 @@ use sp_runtime::{
 	traits::{Header as HeaderT, One, TrailingZeroInput, Zero},
 	RuntimeAppPublic,
 };
-use sp_std::{collections::btree_map::BTreeMap, convert::TryInto, prelude::Vec, vec};
+use sp_std::{collections::btree_map::BTreeMap, prelude::Vec, vec};
 
 fn mock_validation_code() -> ValidationCode {
 	ValidationCode(vec![1, 2, 3])

runtime/parachains/src/paras/mod.rs

@@ -121,7 +121,7 @@ use sp_runtime::{
 	traits::{AppVerify, One},
 	DispatchResult, SaturatedConversion,
 };
-use sp_std::{cmp, convert::TryInto, mem, prelude::*};
+use sp_std::{cmp, mem, prelude::*};
 
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};

runtime/parachains/src/scheduler.rs

@@ -42,7 +42,7 @@ use primitives::v2::{
 };
 use scale_info::TypeInfo;
 use sp_runtime::traits::{One, Saturating};
-use sp_std::{convert::TryInto, prelude::*};
+use sp_std::prelude::*;
 
 use crate::{configuration, initializer::SessionChangeNotification, paras};
 

runtime/parachains/src/ump.rs

@@ -21,9 +21,7 @@ use crate::{
 use frame_support::{pallet_prelude::*, traits::EnsureOrigin};
 use frame_system::pallet_prelude::*;
 use primitives::v2::{Id as ParaId, UpwardMessage};
-use sp_std::{
-	collections::btree_map::BTreeMap, convert::TryFrom, fmt, marker::PhantomData, mem, prelude::*,
-};
+use sp_std::{collections::btree_map::BTreeMap, fmt, marker::PhantomData, mem, prelude::*};
 use xcm::latest::Outcome;
 
 pub use pallet::*;

runtime/rococo/src/bridge_messages.rs

@@ -39,7 +39,7 @@ use frame_support::{
 };
 use rococo_runtime_constants::fee::WeightToFee;
 use sp_runtime::FixedU128;
-use sp_std::{convert::TryFrom, marker::PhantomData, ops::RangeInclusive};
+use sp_std::{marker::PhantomData, ops::RangeInclusive};
 
 /// Maximal number of pending outbound messages.
 const MAXIMAL_PENDING_MESSAGES_AT_OUTBOUND_LANE: MessageNonce =

runtime/test-runtime/src/lib.rs

@@ -850,7 +850,6 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn candidate_events() -> Vec<CandidateEvent<Hash>> {
-			use core::convert::TryInto;
 			runtime_impl::candidate_events::<Runtime, _>(|trait_event| trait_event.try_into().ok())
 		}
 

tests/purge_chain_works.rs

@@ -15,7 +15,7 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 use assert_cmd::cargo::cargo_bin;
-use std::{convert::TryInto, process::Command, time::Duration};
+use std::{process::Command, time::Duration};
 use tempfile::tempdir;
 
 pub mod common;

tests/running_the_node_and_interrupt.rs

@@ -15,7 +15,7 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 use assert_cmd::cargo::cargo_bin;
-use std::{convert::TryInto, process::Command, time::Duration};
+use std::{process::Command, time::Duration};
 use tempfile::tempdir;
 
 pub mod common;

utils/remote-ext-tests/bags-list/src/main.rs

@@ -17,7 +17,6 @@
 //! Remote tests for bags-list pallet.
 
 use clap::{ArgEnum, Parser};
-use std::convert::TryInto;
 
 #[derive(Clone, Debug, ArgEnum)]
 #[clap(rename_all = "PascalCase")]