LPv2: Batch message logic (r2) (#1949)

* add batch logic

* added infrastructure to tests batches

* fix common tests

* fix tests and some renamings

libs/traits/src/liquidity_pools.rs

@@ -23,30 +23,17 @@ use sp_std::vec::Vec;
 pub trait LPEncoding: Sized {
 	fn serialize(&self) -> Vec<u8>;
 	fn deserialize(input: &[u8]) -> Result<Self, DispatchError>;
-}
 
-#[cfg(any(test, feature = "std"))]
-pub mod test_util {
-	use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
-	use scale_info::TypeInfo;
-
-	use super::*;
-
-	#[derive(Default, Debug, Eq, PartialEq, Clone, Encode, Decode, TypeInfo, MaxEncodedLen)]
-	pub struct Message;
-	impl LPEncoding for Message {
-		fn serialize(&self) -> Vec<u8> {
-			vec![0x42]
-		}
-
-		fn deserialize(input: &[u8]) -> Result<Self, DispatchError> {
-			match input.first() {
-				Some(0x42) => Ok(Self),
-				Some(_) => Err("unsupported message".into()),
-				None => Err("empty message".into()),
-			}
-		}
-	}
+	/// Extend this message with a new one
+	fn pack_with(&mut self, other: Self) -> DispatchResult;
+
+	/// Decompose the message into a list of messages
+	/// If the message is not decomposable, it returns the own message.
+	fn submessages(&self) -> Vec<Self>;
+
+	/// Creates an empty message.
+	/// It's the identity message for composing messages with pack_with
+	fn empty() -> Self;
 }
 
 /// The trait required for sending outbound messages.

libs/utils/src/lib.rs

@@ -16,6 +16,26 @@
 use parity_scale_codec::Encode;
 use sp_std::cmp::min;
 
+pub struct BufferReader<'a>(pub &'a [u8]);
+
+impl<'a> BufferReader<'a> {
+	pub fn read_bytes(&mut self, bytes: usize) -> Option<&[u8]> {
+		if self.0.len() < bytes {
+			return None;
+		}
+
+		let (consumed, remaining) = self.0.split_at(bytes);
+		self.0 = remaining;
+		Some(consumed)
+	}
+
+	pub fn read_array<const N: usize>(&mut self) -> Option<&[u8; N]> {
+		let (consumed, remaining) = self.0.split_first_chunk::<N>()?;
+		self.0 = remaining;
+		Some(consumed)
+	}
+}
+
 /// Build a fixed-size array using as many elements from `src` as possible
 /// without overflowing and ensuring that the array is 0 padded in the case
 /// where `src.len()` is smaller than S.

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

@@ -287,7 +287,7 @@ where
 				exit_status: ExitError::Other("account bytes mismatch for domain".into()),
 			})?;
 
-		match pallet_liquidity_pools_gateway::Pallet::<T>::process_msg(
+		match pallet_liquidity_pools_gateway::Pallet::<T>::receive_message(
 			pallet_liquidity_pools_gateway::GatewayOrigin::Domain(domain_address).into(),
 			msg,
 		)

pallets/liquidity-pools-gateway/queue/src/mock.rs

@@ -13,7 +13,6 @@
 
 use cfg_mocks::pallet_mock_liquidity_pools_gateway;
 use cfg_primitives::LPGatewayQueueMessageNonce;
-use cfg_traits::liquidity_pools::test_util::Message as LPTestMessage;
 use cfg_types::domain_address::Domain;
 use frame_support::derive_impl;
 use sp_runtime::traits::ConstU128;
@@ -46,11 +45,11 @@ impl pallet_balances::Config for Runtime {
 
 impl pallet_mock_liquidity_pools_gateway::Config for Runtime {
 	type Destination = Domain;
-	type Message = LPTestMessage;
+	type Message = ();
 }
 
 impl Config for Runtime {
-	type Message = LPTestMessage;
+	type Message = ();
 	type MessageNonce = LPGatewayQueueMessageNonce;
 	type MessageProcessor = LPGatewayMock;
 	type RuntimeEvent = RuntimeEvent;

pallets/liquidity-pools-gateway/queue/src/tests.rs

@@ -1,7 +1,5 @@
 use cfg_primitives::LPGatewayQueueMessageNonce;
-use cfg_traits::liquidity_pools::{
-	test_util::Message as LPTestMessage, MessageQueue as MessageQueueT,
-};
+use cfg_traits::liquidity_pools::MessageQueue as MessageQueueT;
 use frame_support::{assert_noop, assert_ok, dispatch::RawOrigin};
 use sp_runtime::{
 	traits::{BadOrigin, One, Zero},
@@ -35,7 +33,7 @@ mod process_message {
 	#[test]
 	fn success() {
 		new_test_ext().execute_with(|| {
-			let message = LPTestMessage {};
+			let message = ();
 			let nonce = LPGatewayQueueMessageNonce::one();
 
 			MessageQueue::<Runtime>::insert(nonce, message.clone());
@@ -87,7 +85,7 @@ mod process_message {
 	#[test]
 	fn failure_message_processor() {
 		new_test_ext().execute_with(|| {
-			let message = LPTestMessage {};
+			let message = ();
 			let nonce = LPGatewayQueueMessageNonce::one();
 
 			MessageQueue::<Runtime>::insert(nonce, message.clone());
@@ -126,7 +124,7 @@ mod process_failed_message {
 	#[test]
 	fn success() {
 		new_test_ext().execute_with(|| {
-			let message = LPTestMessage {};
+			let message = ();
 			let nonce = LPGatewayQueueMessageNonce::one();
 			let error = DispatchError::Unavailable;
 
@@ -179,7 +177,7 @@ mod process_failed_message {
 	#[test]
 	fn failure_message_processor() {
 		new_test_ext().execute_with(|| {
-			let message = LPTestMessage {};
+			let message = ();
 			let nonce = LPGatewayQueueMessageNonce::one();
 			let error = DispatchError::Unavailable;
 
@@ -218,7 +216,7 @@ mod message_queue_impl {
 	#[test]
 	fn success() {
 		new_test_ext().execute_with(|| {
-			let message = LPTestMessage {};
+			let message = ();
 
 			assert_ok!(LPGatewayQueue::submit(message.clone()));