Use different chain primitives in Millau (#517)

bridges/relays/headers-relay/src/sync_types.rs

@@ -52,21 +52,7 @@ pub trait HeadersSyncPipeline: Clone + Send + Sync {
 	/// Headers we're syncing are identified by this hash.
 	type Hash: Eq + Clone + Copy + Send + Sync + std::fmt::Debug + std::fmt::Display + std::hash::Hash;
 	/// Headers we're syncing are identified by this number.
-	type Number: From<u32>
-		+ Ord
-		+ Clone
-		+ Copy
-		+ Send
-		+ Sync
-		+ std::fmt::Debug
-		+ std::fmt::Display
-		+ std::hash::Hash
-		+ std::ops::Add<Output = Self::Number>
-		+ std::ops::Sub<Output = Self::Number>
-		+ num_traits::Saturating
-		+ num_traits::Zero
-		+ num_traits::One
-		+ Into<u64>;
+	type Number: relay_utils::BlockNumberBase;
 	/// Type of header that we're syncing.
 	type Header: SourceHeader<Self::Hash, Self::Number>;
 	/// Type of extra data for the header that we're receiving from the source node:

bridges/relays/messages-relay/src/message_lane.rs

@@ -19,8 +19,7 @@
 //! 1) relay new messages from source to target node;
 //! 2) relay proof-of-delivery from target to source node.
 
-use relay_utils::HeaderId;
-
+use relay_utils::{BlockNumberBase, HeaderId};
 use std::fmt::Debug;
 
 /// One-way message lane.
@@ -36,12 +35,12 @@ pub trait MessageLane: Clone + Send + Sync {
 	type MessagesReceivingProof: Clone + Send + Sync;
 
 	/// Number of the source header.
-	type SourceHeaderNumber: Clone + Debug + Ord + PartialEq + Into<u64> + Send + Sync;
+	type SourceHeaderNumber: BlockNumberBase;
 	/// Hash of the source header.
 	type SourceHeaderHash: Clone + Debug + Default + PartialEq + Send + Sync;
 
 	/// Number of the target header.
-	type TargetHeaderNumber: Clone + Debug + Ord + PartialEq + Into<u64> + Send + Sync;
+	type TargetHeaderNumber: BlockNumberBase;
 	/// Hash of the target header.
 	type TargetHeaderHash: Clone + Debug + Default + PartialEq + Send + Sync;
 }

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

@@ -25,7 +25,6 @@ use headers_relay::{
 	sync_loop::SourceClient,
 	sync_types::{HeaderIdOf, HeadersSyncPipeline, QueuedHeader, SourceHeader},
 };
-use num_traits::Saturating;
 use sp_runtime::{traits::Header as HeaderT, Justification};
 use std::marker::PhantomData;
 
@@ -49,7 +48,7 @@ impl<C: Chain, P> HeadersSource<C, P> {
 impl<C, P> SourceClient<P> for HeadersSource<C, P>
 where
 	C: Chain,
-	C::BlockNumber: Into<u64> + Saturating,
+	C::BlockNumber: relay_utils::BlockNumberBase,
 	C::Header: Into<P::Header>,
 	P: HeadersSyncPipeline<Extra = (), Completion = Justification, Hash = C::Hash, Number = C::BlockNumber>,
 	P::Header: SourceHeader<C::Hash, C::BlockNumber>,

bridges/relays/substrate/src/headers_pipeline.rs

@@ -26,8 +26,8 @@ use headers_relay::{
 	sync::{HeadersSyncParams, TargetTransactionMode},
 	sync_types::{HeadersSyncPipeline, QueuedHeader, SourceHeader},
 };
-use num_traits::Saturating;
 use relay_substrate_client::{headers_source::HeadersSource, BlockNumberOf, Chain, Client, HashOf};
+use relay_utils::BlockNumberBase;
 use sp_runtime::Justification;
 use std::marker::PhantomData;
 
@@ -59,7 +59,7 @@ impl<SourceChain, SourceSyncHeader, TargetChain, TargetSign> HeadersSyncPipeline
 	for SubstrateHeadersToSubstrate<SourceChain, SourceSyncHeader, TargetChain, TargetSign>
 where
 	SourceChain: Clone + Chain,
-	BlockNumberOf<SourceChain>: Saturating + Into<u64>,
+	BlockNumberOf<SourceChain>: BlockNumberBase,
 	SourceSyncHeader:
 		SourceHeader<HashOf<SourceChain>, BlockNumberOf<SourceChain>> + std::ops::Deref<Target = SourceChain::Header>,
 	TargetChain: Clone + Chain,
@@ -107,7 +107,7 @@ pub async fn run<SourceChain, TargetChain, P>(
 	P::Header: SourceHeader<HashOf<SourceChain>, BlockNumberOf<SourceChain>>,
 	SourceChain: Clone + Chain,
 	SourceChain::Header: Into<P::Header>,
-	BlockNumberOf<SourceChain>: Into<u64> + Saturating,
+	BlockNumberOf<SourceChain>: BlockNumberBase,
 	TargetChain: Clone + Chain,
 {
 	let source_justifications = match source_client.clone().subscribe_justifications().await {

bridges/relays/substrate/src/messages_source.rs

@@ -28,7 +28,7 @@ use messages_relay::{
 	message_lane_loop::{ClientState, MessageProofParameters, MessageWeightsMap, SourceClient, SourceClientState},
 };
 use relay_substrate_client::{Chain, Client, Error as SubstrateError, HashOf, HeaderIdOf};
-use relay_utils::HeaderId;
+use relay_utils::{BlockNumberBase, HeaderId};
 use sp_core::Bytes;
 use sp_runtime::{traits::Header as HeaderT, DeserializeOwned};
 use sp_trie::StorageProof;
@@ -93,7 +93,7 @@ where
 	C: Chain,
 	C::Header: DeserializeOwned,
 	C::Index: DeserializeOwned,
-	<C::Header as HeaderT>::Number: Into<u64>,
+	C::BlockNumber: BlockNumberBase,
 	P: MessageLane<
 		MessagesProof = SubstrateMessagesProof<C>,
 		SourceHeaderNumber = <C::Header as HeaderT>::Number,

bridges/relays/substrate/src/messages_target.rs

@@ -29,6 +29,7 @@ use messages_relay::{
 	message_lane_loop::{TargetClient, TargetClientState},
 };
 use relay_substrate_client::{Chain, Client, Error as SubstrateError, HashOf};
+use relay_utils::BlockNumberBase;
 use sp_core::Bytes;
 use sp_runtime::{traits::Header as HeaderT, DeserializeOwned};
 use sp_trie::StorageProof;
@@ -89,7 +90,7 @@ where
 	C: Chain,
 	C::Header: DeserializeOwned,
 	C::Index: DeserializeOwned,
-	<C::Header as HeaderT>::Number: Into<u64>,
+	<C::Header as HeaderT>::Number: BlockNumberBase,
 	P: MessageLane<
 		MessagesReceivingProof = (HashOf<C>, StorageProof, LaneId),
 		TargetHeaderNumber = <C::Header as HeaderT>::Number,

bridges/relays/utils/Cargo.toml

@@ -12,6 +12,7 @@ backoff = "0.2"
 env_logger = "0.7.0"
 futures = "0.3.5"
 log = "0.4.11"
+num-traits = "0.2"
 sysinfo = "0.15"
 time = "0.2"
 

bridges/relays/utils/src/lib.rs

@@ -30,6 +30,51 @@ pub const CONNECTION_ERROR_DELAY: Duration = Duration::from_secs(10);
 pub mod initialize;
 pub mod metrics;
 
+/// Block number traits shared by all chains that relay is able to serve.
+pub trait BlockNumberBase:
+	'static
+	+ From<u32>
+	+ Into<u64>
+	+ Ord
+	+ Clone
+	+ Copy
+	+ Default
+	+ Send
+	+ Sync
+	+ std::fmt::Debug
+	+ std::fmt::Display
+	+ std::hash::Hash
+	+ std::ops::Add<Output = Self>
+	+ std::ops::Sub<Output = Self>
+	+ num_traits::CheckedSub
+	+ num_traits::Saturating
+	+ num_traits::Zero
+	+ num_traits::One
+{
+}
+
+impl<T> BlockNumberBase for T where
+	T: 'static
+		+ From<u32>
+		+ Into<u64>
+		+ Ord
+		+ Clone
+		+ Copy
+		+ Default
+		+ Send
+		+ Sync
+		+ std::fmt::Debug
+		+ std::fmt::Display
+		+ std::hash::Hash
+		+ std::ops::Add<Output = Self>
+		+ std::ops::Sub<Output = Self>
+		+ num_traits::CheckedSub
+		+ num_traits::Saturating
+		+ num_traits::Zero
+		+ num_traits::One
+{
+}
+
 /// Macro that returns (client, Err(error)) tuple from function if result is Err(error).
 #[macro_export]
 macro_rules! bail_on_error {