Use H160 as AccountId

modules/dispatch/src/lib.rs

@@ -105,7 +105,7 @@ pub mod pallet {
 		/// A type which can be turned into an AccountId from a 256-bit hash.
 		///
 		/// Used when deriving target chain AccountIds from source chain AccountIds.
-		type AccountIdConverter: sp_runtime::traits::Convert<sp_core::hash::H256, Self::AccountId>;
+		type AccountIdConverter: sp_runtime::traits::Convert<sp_core::hash::H160, Self::AccountId>;
 		/// The type is used to customize the dispatch call origin.
 		type IntoDispatchOrigin: IntoDispatchOrigin<
 			Self::AccountId,
@@ -489,7 +489,7 @@ mod tests {
 	use frame_support::{parameter_types, weights::Weight};
 	use frame_system::{mocking::*, EventRecord, Phase};
 	use scale_info::TypeInfo;
-	use sp_core::H256;
+	use sp_core::{H160, H256};
 	use sp_runtime::{
 		testing::Header,
 		traits::{BlakeTwo256, IdentityLookup},
@@ -530,8 +530,8 @@ mod tests {
 	}
 
 	pub struct AccountIdConverter;
-	impl sp_runtime::traits::Convert<H256, AccountId> for AccountIdConverter {
-		fn convert(hash: H256) -> AccountId {
+	impl sp_runtime::traits::Convert<H160, AccountId> for AccountIdConverter {
+		fn convert(hash: H160) -> AccountId {
 			hash.to_low_u64_ne()
 		}
 	}
@@ -926,17 +926,20 @@ mod tests {
 	#[test]
 	fn should_emit_event_for_unpaid_calls() {
 		new_test_ext().execute_with(|| {
+			println!("111");
 			let id = [0; 4];
 			let relayer_account = 1;
 
 			let mut message =
 				prepare_root_message(RuntimeCall::System(frame_system::Call::remark {
 					remark: vec![1, 2, 3],
 				}));
+
 			let weight = message.weight;
 			message.dispatch_fee_payment = DispatchFeePayment::AtTargetChain;
 
 			System::set_block_number(1);
+			println!("222");
 			let result = Dispatch::dispatch(
 				SOURCE_CHAIN_ID,
 				TARGET_CHAIN_ID,
@@ -945,6 +948,7 @@ mod tests {
 				Ok(message),
 				|_, _| Err(()),
 			);
+			println!("333");
 			assert_eq!(result.unspent_weight, weight);
 			assert!(!result.dispatch_result);
 

modules/fee-market/src/mock.rs

@@ -44,7 +44,7 @@ use frame_support::{
 };
 use frame_system::mocking::*;
 use pallet_bridge_messages::outbound_lane;
-use sp_core::H256;
+use sp_core::{H160, H256};
 use sp_runtime::{
 	testing::Header,
 	traits::{AccountIdConversion, BlakeTwo256, IdentityLookup, UniqueSaturatedInto},
@@ -399,8 +399,8 @@ impl MessageDispatch<AccountId, TestMessageFee> for TestMessageDispatch {
 }
 
 pub struct AccountIdConverter;
-impl sp_runtime::traits::Convert<H256, AccountId> for AccountIdConverter {
-	fn convert(hash: H256) -> AccountId {
+impl sp_runtime::traits::Convert<H160, AccountId> for AccountIdConverter {
+	fn convert(hash: H160) -> AccountId {
 		hash.to_low_u64_ne()
 	}
 }

modules/messages/src/lib.rs

@@ -81,7 +81,7 @@ use bp_messages::{
 use bp_runtime::{BasicOperatingMode, ChainId, OwnedBridgeModule, Size};
 // paritytech
 use frame_support::{dispatch::PostDispatchInfo, ensure, fail, log, traits::Get};
-use sp_core::H256;
+use sp_core::H160;
 use sp_runtime::traits::Convert;
 use sp_std::{cell::RefCell, marker::PhantomData, prelude::*};
 
@@ -167,7 +167,7 @@ pub mod pallet {
 		/// A type which can be turned into an AccountId from a 256-bit hash.
 		///
 		/// Used when deriving the shared relayer fund account.
-		type AccountIdConverter: sp_runtime::traits::Convert<sp_core::hash::H256, Self::AccountId>;
+		type AccountIdConverter: sp_runtime::traits::Convert<sp_core::hash::H160, Self::AccountId>;
 
 		// Types that are used by outbound_lane (on source chain).
 
@@ -692,7 +692,7 @@ pub use pallet::*;
 /// This account is passed to `MessageDeliveryAndDispatchPayment` trait, and depending
 /// on the implementation it can be used to store relayers rewards.
 /// See [`InstantCurrencyPayments`] for a concrete implementation.
-pub fn relayer_fund_account_id<AccountId, AccountIdConverter: Convert<H256, AccountId>>(
+pub fn relayer_fund_account_id<AccountId, AccountIdConverter: Convert<H160, AccountId>>(
 ) -> AccountId {
 	let encoded_id = bp_runtime::derive_relayer_fund_account_id(bp_runtime::NO_INSTANCE_ID);
 	AccountIdConverter::convert(encoded_id)

modules/messages/src/mock.rs

@@ -109,8 +109,8 @@ pub struct TestPayload {
 }
 
 pub struct AccountIdConverter;
-impl sp_runtime::traits::Convert<H256, AccountId> for AccountIdConverter {
-	fn convert(hash: H256) -> AccountId {
+impl sp_runtime::traits::Convert<H160, AccountId> for AccountIdConverter {
+	fn convert(hash: H160) -> AccountId {
 		hash.to_low_u64_ne()
 	}
 }

primitives/darwinia-core/Cargo.toml

@@ -10,6 +10,8 @@ version     = "0.1.0"
 # crates.io
 parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info         = { version = "2.0.1", default-features = false, features = ["derive"] }
+# moonbeam
+account = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.30" }
 # paritytech
 bp-messages   = { default-features = false, path = "../messages" }
 bp-runtime    = { default-features = false, path = "../runtime" }
@@ -25,6 +27,8 @@ std = [
 	# crates.io
 	"parity-scale-codec/std",
 	"scale-info/std",
+	# moonbeam
+	"account/std",
 	# paritytech
 	"bp-messages/std",
 	"bp-runtime/std",