Removed without_storage_info from messages and schema pallets

pallets/messages/src/benchmarking.rs

@@ -13,7 +13,6 @@ use frame_support::{assert_ok, pallet_prelude::DispatchResult};
 use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin};
 use sp_runtime::traits::One;
 
-const AVERAGE_NUMBER_OF_MESSAGES: u32 = 499;
 const IPFS_SCHEMA_ID: u16 = 50;
 const IPFS_PAYLOAD_LENGTH: u32 = 10;
 
@@ -23,7 +22,7 @@ fn onchain_message<T: Config>(schema_id: SchemaId) -> DispatchResult {
 	let payload = Vec::from(
 		"{'fromId': 123, 'content': '232323', 'fromId': 123, 'content': '232323'}".as_bytes(),
 	);
-	let bounded_payload: BoundedVec<u8, T::MaxMessagePayloadSizeBytes> =
+	let bounded_payload: BoundedVec<u8, T::MessagesMaxPayloadSizeBytes> =
 		payload.try_into().expect("Invalid payload");
 	MessagesPallet::<T>::add_message(
 		provider_id.into(),
@@ -40,7 +39,7 @@ fn ipfs_message<T: Config>(schema_id: SchemaId) -> DispatchResult {
 	let payload =
 		Vec::from("bafkreidgvpkjawlxz6sffxzwgooowe5yt7i6wsyg236mfoks77nywkptdq".as_bytes());
 	let provider_id = ProviderId(1);
-	let bounded_payload: BoundedVec<u8, T::MaxMessagePayloadSizeBytes> =
+	let bounded_payload: BoundedVec<u8, T::MessagesMaxPayloadSizeBytes> =
 		payload.try_into().expect("Invalid payload");
 
 	MessagesPallet::<T>::add_message(
@@ -63,8 +62,10 @@ fn create_schema<T: Config>(location: PayloadLocation) -> DispatchResult {
 }
 
 benchmarks! {
+	// this is temporary to avoid massive PoV sizes which will break the chain until rework on messages
+	#[pov_mode = Measured]
 	add_onchain_message {
-		let n in 0 .. T::MaxMessagePayloadSizeBytes::get() - 1;
+		let n in 0 .. T::MessagesMaxPayloadSizeBytes::get() - 1;
 		let message_source_id = DelegatorId(2);
 		let caller: T::AccountId = whitelisted_caller();
 		let schema_id = 1;
@@ -77,19 +78,21 @@ benchmarks! {
 		assert_ok!(T::MsaBenchmarkHelper::set_delegation_relationship(ProviderId(1), message_source_id.into(), [schema_id].to_vec()));
 
 		let payload = vec![1; n as usize];
-
-		for j in 1 .. AVERAGE_NUMBER_OF_MESSAGES {
+		let average_messages_per_block: u32 = T::MaxMessagesPerBlock::get() / 2;
+		for j in 1 .. average_messages_per_block {
 			assert_ok!(onchain_message::<T>(schema_id));
 		}
 	}: _ (RawOrigin::Signed(caller), Some(message_source_id.into()), schema_id, payload)
 	verify {
 		assert_eq!(
 			MessagesPallet::<T>::get_messages(
 				BlockNumberFor::<T>::one(), schema_id).len(),
-			AVERAGE_NUMBER_OF_MESSAGES as usize
+			average_messages_per_block as usize
 		);
 	}
 
+	// this is temporary to avoid massive PoV sizes which will break the chain until rework on messages
+	#[pov_mode = Measured]
 	add_ipfs_message {
 		let caller: T::AccountId = whitelisted_caller();
 		let cid = "bafkreidgvpkjawlxz6sffxzwgooowe5yt7i6wsyg236mfoks77nywkptdq".as_bytes().to_vec();
@@ -99,16 +102,16 @@ benchmarks! {
 			assert_ok!(create_schema::<T>(PayloadLocation::IPFS));
 		}
 		assert_ok!(T::MsaBenchmarkHelper::add_key(ProviderId(1).into(), caller.clone()));
-
-		for j in 1 .. AVERAGE_NUMBER_OF_MESSAGES {
+		let average_messages_per_block: u32 = T::MaxMessagesPerBlock::get() / 2;
+		for j in 1 .. average_messages_per_block {
 			assert_ok!(ipfs_message::<T>(IPFS_SCHEMA_ID));
 		}
 	}: _ (RawOrigin::Signed(caller),IPFS_SCHEMA_ID, cid, IPFS_PAYLOAD_LENGTH)
 	verify {
 		assert_eq!(
 			MessagesPallet::<T>::get_messages(
 				BlockNumberFor::<T>::one(), IPFS_SCHEMA_ID).len(),
-			AVERAGE_NUMBER_OF_MESSAGES as usize
+			average_messages_per_block as usize
 		);
 	}
 

pallets/messages/src/lib.rs

@@ -55,7 +55,7 @@ mod types;
 
 use frame_support::{ensure, pallet_prelude::Weight, traits::Get, BoundedVec};
 use sp_runtime::DispatchError;
-use sp_std::{convert::TryInto, prelude::*};
+use sp_std::{convert::TryInto, fmt::Debug, prelude::*};
 
 use codec::Encode;
 use common_primitives::{
@@ -105,7 +105,7 @@ pub mod pallet {
 
 		/// The maximum size of a message payload bytes.
 		#[pallet::constant]
-		type MaxMessagePayloadSizeBytes: Get<u32> + Clone;
+		type MessagesMaxPayloadSizeBytes: Get<u32> + Clone + Debug + MaxEncodedLen;
 
 		#[cfg(feature = "runtime-benchmarks")]
 		/// A set of helper functions for benchmarking.
@@ -117,7 +117,6 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	/// A permanent storage for messages mapped by block number and schema id.
@@ -131,7 +130,7 @@ pub mod pallet {
 		BlockNumberFor<T>,
 		Twox64Concat,
 		SchemaId,
-		BoundedVec<Message<T::MaxMessagePayloadSizeBytes>, T::MaxMessagesPerBlock>,
+		BoundedVec<Message<T::MessagesMaxPayloadSizeBytes>, T::MaxMessagesPerBlock>,
 		ValueQuery,
 	>;
 
@@ -226,7 +225,7 @@ pub mod pallet {
 			let provider_key = ensure_signed(origin)?;
 			let cid_binary = Self::validate_cid(&cid)?;
 			let payload_tuple: OffchainPayloadType = (cid_binary, payload_length);
-			let bounded_payload: BoundedVec<u8, T::MaxMessagePayloadSizeBytes> = payload_tuple
+			let bounded_payload: BoundedVec<u8, T::MessagesMaxPayloadSizeBytes> = payload_tuple
 				.encode()
 				.try_into()
 				.map_err(|_| Error::<T>::ExceedsMaxMessagePayloadSizeBytes)?;
@@ -281,7 +280,7 @@ pub mod pallet {
 		) -> DispatchResult {
 			let provider_key = ensure_signed(origin)?;
 
-			let bounded_payload: BoundedVec<u8, T::MaxMessagePayloadSizeBytes> =
+			let bounded_payload: BoundedVec<u8, T::MessagesMaxPayloadSizeBytes> =
 				payload.try_into().map_err(|_| Error::<T>::ExceedsMaxMessagePayloadSizeBytes)?;
 
 			if let Some(schema) = T::SchemaProvider::get_schema_by_id(schema_id) {
@@ -341,7 +340,7 @@ impl<T: Config> Pallet<T> {
 	pub fn add_message(
 		provider_msa_id: MessageSourceId,
 		msa_id: Option<MessageSourceId>,
-		payload: BoundedVec<u8, T::MaxMessagePayloadSizeBytes>,
+		payload: BoundedVec<u8, T::MessagesMaxPayloadSizeBytes>,
 		schema_id: SchemaId,
 		current_block: BlockNumberFor<T>,
 	) -> Result<bool, DispatchError> {

pallets/messages/src/tests/mock.rs

@@ -7,6 +7,7 @@ use common_primitives::{
 	schema::*,
 };
 
+use codec::{Encode, MaxEncodedLen};
 use frame_support::{
 	dispatch::DispatchResult,
 	parameter_types,
@@ -77,26 +78,34 @@ parameter_types! {
 	// should have this set large enough to accommodate the largest possible CID.
 	// Take care when adding new tests for on-chain (not IPFS) messages that the payload
 	// is not too big.
-	pub const MaxMessagePayloadSizeBytes: u32 = 73;
+	pub const MessagesMaxPayloadSizeBytes: u32 = 73;
 }
 
-impl std::fmt::Debug for MaxMessagePayloadSizeBytes {
+impl std::fmt::Debug for MessagesMaxPayloadSizeBytes {
 	fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-		f.debug_struct("MaxMessagePayloadSizeBytes")
-			.field("v", &MaxMessagePayloadSizeBytes::get())
+		f.debug_struct("MessagesMaxPayloadSizeBytes")
+			.field("v", &MessagesMaxPayloadSizeBytes::get())
 			.finish()
 	}
 }
 
-impl PartialEq for MaxMessagePayloadSizeBytes {
+impl PartialEq for MessagesMaxPayloadSizeBytes {
 	fn eq(&self, _other: &Self) -> bool {
 		true
 	}
 }
 
-impl Clone for MaxMessagePayloadSizeBytes {
+impl Clone for MessagesMaxPayloadSizeBytes {
 	fn clone(&self) -> Self {
-		MaxMessagePayloadSizeBytes {}
+		MessagesMaxPayloadSizeBytes {}
+	}
+}
+
+impl Encode for MessagesMaxPayloadSizeBytes {}
+
+impl MaxEncodedLen for MessagesMaxPayloadSizeBytes {
+	fn max_encoded_len() -> usize {
+		u32::max_encoded_len()
 	}
 }
 
@@ -213,7 +222,7 @@ impl pallet_messages::Config for Test {
 	type SchemaProvider = SchemaHandler;
 	type WeightInfo = ();
 	type MaxMessagesPerBlock = MaxMessagesPerBlock;
-	type MaxMessagePayloadSizeBytes = MaxMessagePayloadSizeBytes;
+	type MessagesMaxPayloadSizeBytes = MessagesMaxPayloadSizeBytes;
 
 	/// A set of helper functions for benchmarking.
 	#[cfg(feature = "runtime-benchmarks")]

pallets/messages/src/tests/other_tests.rs

@@ -362,7 +362,7 @@ fn retrieved_ipfs_message_should_always_be_in_base32() {
 #[test]
 fn get_messages_by_schema_with_ipfs_payload_location_should_fail_bad_schema() {
 	new_test_ext().execute_with(|| {
-		let bad_message: Message<MaxMessagePayloadSizeBytes> = Message {
+		let bad_message: Message<MessagesMaxPayloadSizeBytes> = Message {
 			payload: BoundedVec::try_from(
 				vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16].to_vec(),
 			)

pallets/messages/src/types.rs

@@ -1,21 +1,22 @@
-use codec::{Decode, Encode};
+use codec::{Decode, Encode, MaxEncodedLen};
 use common_primitives::{
 	messages::MessageResponse, msa::MessageSourceId, node::BlockNumber, schema::PayloadLocation,
 };
 use frame_support::{traits::Get, BoundedVec};
 use multibase::Base;
 use scale_info::TypeInfo;
-use sp_std::prelude::*;
+use sp_std::{fmt::Debug, prelude::*};
 
 /// Payloads stored offchain contain a tuple of (bytes(the payload reference), payload length).
 pub type OffchainPayloadType = (Vec<u8>, u32);
 
 /// A single message type definition.
-#[derive(Default, Encode, Decode, PartialEq, Debug, TypeInfo, Eq)]
+#[derive(Default, Encode, Decode, PartialEq, Debug, TypeInfo, Eq, MaxEncodedLen)]
 #[scale_info(skip_type_params(MaxDataSize))]
+#[codec(mel_bound(MaxDataSize: MaxEncodedLen))]
 pub struct Message<MaxDataSize>
 where
-	MaxDataSize: Get<u32>,
+	MaxDataSize: Get<u32> + Debug,
 {
 	///  Data structured by the associated schema's model.
 	pub payload: BoundedVec<u8, MaxDataSize>,
@@ -32,7 +33,7 @@ where
 
 impl<MaxDataSize> Message<MaxDataSize>
 where
-	MaxDataSize: Get<u32>,
+	MaxDataSize: Get<u32> + Debug,
 {
 	/// Helper function to handle response type [`MessageResponse`] depending on the Payload Location (on chain or IPFS)
 	pub fn map_to_response(