Comanion for substrate#11136 (#5218)

* Comanion for substrate#11136

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* revert changes in bridge

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

polkadot/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.

polkadot/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;

polkadot/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;
 

polkadot/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)]

polkadot/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,

polkadot/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::*;

polkadot/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;

polkadot/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::{

polkadot/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";

polkadot/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 {

polkadot/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";

polkadot/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> =