LP Tweaks

libs/types/src/domain_address.rs

@@ -13,6 +13,7 @@
 use cfg_traits::liquidity_pools::Codec;
 use cfg_utils::{decode_be_bytes, vec_to_fixed_array};
 use codec::{Decode, Encode, Input, MaxEncodedLen};
+use frame_support::RuntimeDebug;
 use scale_info::TypeInfo;
 use sp_runtime::traits::{AccountIdConversion, Convert};
 use sp_std::{vec, vec::Vec};
@@ -23,8 +24,7 @@ use crate::EVMChainId;
 /// The domain indices need to match those used in the EVM contracts and these
 /// need to pass the Centrifuge domain to send tranche tokens from the other
 /// domain here. Therefore, DO NOT remove or move variants around.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Encode, Decode, Clone, Eq, MaxEncodedLen, PartialEq, RuntimeDebug, TypeInfo)]
 pub enum Domain {
 	/// Referring to the Centrifuge Parachain. Will be used for handling
 	/// incoming messages.
@@ -77,8 +77,7 @@ pub struct DomainLocator<Domain> {
 	pub domain: Domain,
 }
 
-#[derive(Encode, Decode, Clone, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Encode, Decode, Clone, Eq, MaxEncodedLen, PartialEq, RuntimeDebug, TypeInfo)]
 pub enum DomainAddress {
 	/// A Centrifuge-Chain based account address, 32-bytes long
 	Centrifuge([u8; 32]),

pallets/liquidity-pools-gateway/src/lib.rs

@@ -94,7 +94,7 @@ pub mod pallet {
 		///
 		/// NOTE - this `Codec` trait is the Centrifuge trait for liquidity
 		/// pools' messages.
-		type Message: Codec + Clone;
+		type Message: Codec + Clone + Debug + PartialEq;
 
 		/// The message router type that is stored for each domain.
 		type Router: DomainRouter<Sender = Self::AccountId, Message = Self::Message>
@@ -145,8 +145,8 @@ pub mod pallet {
 		/// An outbound message has been submitted.
 		OutboundMessageSubmitted {
 			sender: T::AccountId,
-			message: Vec<u8>,
 			domain: Domain,
+			message: T::Message,
 		},
 	}
 
@@ -478,7 +478,7 @@ pub mod pallet {
 		fn submit(
 			sender: Self::Sender,
 			destination: Self::Destination,
-			msg: Self::Message,
+			message: Self::Message,
 		) -> DispatchResult {
 			ensure!(
 				destination != Domain::Centrifuge,
@@ -488,12 +488,12 @@ pub mod pallet {
 			let router =
 				DomainRouters::<T>::get(destination.clone()).ok_or(Error::<T>::RouterNotFound)?;
 
-			router.send(T::Sender::get(), msg.clone())?;
+			router.send(T::Sender::get(), message.clone())?;
 
 			Self::deposit_event(Event::OutboundMessageSubmitted {
 				sender,
-				message: msg.serialize(),
 				domain: destination,
+				message,
 			});
 
 			Ok(())

pallets/liquidity-pools/src/message.rs

@@ -2,6 +2,7 @@ use cfg_primitives::Moment;
 use cfg_traits::liquidity_pools::Codec;
 use cfg_utils::{decode, decode_be_bytes, encode_be};
 use codec::{Decode, Encode, Input};
+use frame_support::RuntimeDebug;
 use scale_info::TypeInfo;
 use sp_std::{vec, vec::Vec};
 
@@ -28,8 +29,7 @@ pub const TOKEN_SYMBOL_SIZE: usize = 32;
 ///
 /// NOTE: The sender of a message cannot ensure whether the
 /// corresponding receiver rejects it.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub enum Message<Domain, PoolId, TrancheId, Balance, Ratio>
 where
 	Domain: Codec,