lp-forwarder: Always use Centrifuge domain when wrapping outbound mes…

…sages
centrifuge · Aug 19, 2024 · f76c78e · f76c78e
1 parent c55e74f
commit f76c78e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 16 deletions.
diff --git a/libs/traits/src/liquidity_pools.rs b/libs/traits/src/liquidity_pools.rs
@@ -83,11 +83,7 @@ pub trait LpMessageForwarded: Sized {
 	fn unwrap_forwarded(self) -> Option<(Self::Domain, H160, Self)>;
 
 	/// Attempts to wrap into a forwarded message.
-	fn try_wrap_forward(
-		domain: Self::Domain,
-		forwarding_contract: H160,
-		message: Self,
-	) -> Result<Self, DispatchError>;
+	fn try_wrap_forward(forwarding_contract: H160, message: Self) -> Result<Self, DispatchError>;
 }
 
 pub trait RouterProvider<Domain>: Sized {

diff --git a/pallets/liquidity-pools-forwarder/src/lib.rs b/pallets/liquidity-pools-forwarder/src/lib.rs
@@ -210,9 +210,7 @@ pub mod pallet {
 			message: T::Message,
 		) -> DispatchResult {
 			let msg = RouterForwarding::<T>::get(&router_id)
-				.map(|info| {
-					T::Message::try_wrap_forward(info.source_domain, info.contract, message.clone())
-				})
+				.map(|info| T::Message::try_wrap_forward(info.contract, message.clone()))
 				.unwrap_or_else(|| {
 					ensure!(!message.is_forwarded(), Error::<T>::ForwardInfoNotFound);
 					Ok(message)

diff --git a/pallets/liquidity-pools-forwarder/src/mock.rs b/pallets/liquidity-pools-forwarder/src/mock.rs
@@ -46,7 +46,7 @@ impl LpMessageForwarded for Message {
 		}
 	}
 
-	fn try_wrap_forward(_: Self::Domain, _: H160, message: Self) -> Result<Self, DispatchError> {
+	fn try_wrap_forward(_: H160, message: Self) -> Result<Self, DispatchError> {
 		match message {
 			Self::Forward => Err(ERROR_NESTING),
 			Self::NonForward => Ok(Self::Forward),

diff --git a/pallets/liquidity-pools/src/message.rs b/pallets/liquidity-pools/src/message.rs
@@ -659,13 +659,9 @@ impl LpMessageForwarded for Message {
 		}
 	}
 
-	fn try_wrap_forward(
-		source_domain: Domain,
-		forwarding_contract: H160,
-		message: Self,
-	) -> Result<Self, DispatchError> {
+	fn try_wrap_forward(forwarding_contract: H160, message: Self) -> Result<Self, DispatchError> {
 		Ok(Self::Forwarded {
-			source_domain: source_domain.into(),
+			source_domain: Domain::Centrifuge.into(),
 			forwarding_contract,
 			message: message.try_into().map_err(|_| {
 				DispatchError::Other(

diff --git a/runtime/integration-tests/submodules/liquidity-pools b/runtime/integration-tests/submodules/liquidity-pools