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

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

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

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

polkadot/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![

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

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

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

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

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

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

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

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

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

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

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

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