use bounded vec

Signed-off-by: Alexandru Gheorghe <[email protected]>

Author: alexggh

cumulus/zombienet/zombienet-sdk/tests/zombie_ci/statement_store.rs

@@ -79,7 +79,7 @@ async fn statement_store() -> Result<(), anyhow::Error> {
 	let mut subscription = dave_rpc
 		.subscribe::<Bytes>(
 			"statement_subscribeStatement",
-			rpc_params![TopicFilter::MatchAll(vec![topic.to_vec().into()])],
+			rpc_params![TopicFilter::MatchAll(vec![topic.to_vec().into()].try_into().expect("Single topic"))],
 			"statement_unsubscribeStatement",
 		)
 		.await?;

cumulus/zombienet/zombienet-sdk/tests/zombie_ci/statement_store_bench.rs

@@ -547,10 +547,11 @@ impl Participant {
 				.rpc_client
 				.subscribe::<Bytes>(
 					"statement_subscribeStatement",
-					rpc_params![TopicFilter::MatchAll(vec![
-						topic_public_key().to_vec().into(),
-						topic_idx(*idx).to_vec().into()
-					])],
+					rpc_params![TopicFilter::MatchAll(
+					vec![topic_public_key().to_vec().into(), topic_idx(*idx).to_vec().into()]
+						.try_into()
+						.expect("Two topics")
+				)],
 					"statement_unsubscribeStatement",
 				)
 				.await?;
@@ -620,10 +621,14 @@ impl Participant {
 				.rpc_client
 				.subscribe::<Bytes>(
 					"statement_subscribeStatement",
-					rpc_params![TopicFilter::MatchAll(vec![
+					rpc_params![TopicFilter::MatchAll(
+					vec![
 						topic_message().to_vec().into(),
 						topic_pair(&sender_session_key, &own_session_key).to_vec().into()
-					])],
+					]
+					.try_into()
+					.expect("Two topics")
+				)],
 					"statement_unsubscribeStatement",
 				)
 				.await?;
@@ -860,7 +865,9 @@ async fn statement_store_latency_bench() -> Result<(), anyhow::Error> {
 						let subscription = rpc_client
 							.subscribe::<Bytes>(
 								"statement_subscribeStatement",
-								rpc_params![TopicFilter::MatchAll(vec![topic.to_vec().into()])],
+								rpc_params![TopicFilter::MatchAll(
+								vec![topic.to_vec().into()].try_into().expect("Single topic")
+							)],
 								"statement_unsubscribeStatement",
 							)
 							.await

substrate/client/rpc/src/statement/tests.rs

@@ -71,12 +71,17 @@ async fn subscribe_works() {
 	let submitted = generate_statements();
 	let first_topic: Bytes = submitted[0].topic(0).expect("Should have topic").to_vec().into();
 
-	let match_all_filter = TopicFilter::MatchAll(vec![first_topic.clone()]);
+	let match_all_filter =
+		TopicFilter::MatchAll(vec![first_topic.clone()].try_into().expect("Single topic"));
 	let submitted_clone = submitted.clone();
-	let match_any_filter = TopicFilter::MatchAny(vec![
-		submitted[0].topic(1).expect("Should have topic").to_vec().into(),
-		submitted[1].topic(1).expect("Should have topic").to_vec().into(),
-	]);
+	let match_any_filter = TopicFilter::MatchAny(
+		vec![
+			submitted[0].topic(1).expect("Should have topic").to_vec().into(),
+			submitted[1].topic(1).expect("Should have topic").to_vec().into(),
+		]
+		.try_into()
+		.expect("Two topics"),
+	);
 
 	let subscriptions = subscribe_to_topics(
 		&api_rpc,
@@ -115,7 +120,7 @@ async fn subscribe_works() {
 	let mut match_any_with_random = api_rpc
 		.subscribe_unbounded(
 			"statement_subscribeStatement",
-			(TopicFilter::MatchAny(vec![vec![7u8; 32].into()]),),
+			(TopicFilter::MatchAny(vec![vec![7u8; 32].into()].try_into().expect("Single topic")),),
 		)
 		.await
 		.expect("Failed to subscribe");
@@ -127,7 +132,9 @@ async fn subscribe_works() {
 	.await;
 	assert!(res.is_err(), "expected no message for random topic");
 
-	let match_all_with_random = TopicFilter::MatchAll(vec![first_topic, vec![7u8; 32].into()]);
+	let match_all_with_random = TopicFilter::MatchAll(
+		vec![first_topic, vec![7u8; 32].into()].try_into().expect("Two topics"),
+	);
 	let mut match_all_with_random = api_rpc
 		.subscribe("statement_subscribeStatement", (match_all_with_random,), 100000)
 		.await

substrate/primitives/statement-store/src/lib.rs

@@ -42,7 +42,7 @@ pub type AccountId = [u8; 32];
 /// Statement channel.
 pub type Channel = [u8; 32];
 
-/// Total number of topic fields allowed.
+/// Total number of topic fields allowed in a statement and in `MatchAll` filters.
 pub const MAX_TOPICS: usize = 4;
 /// `MatchAny` allows to provide a list of topics match against. This is the maximum number of
 /// topics allowed.

substrate/primitives/statement-store/src/store_api.rs

@@ -17,7 +17,7 @@
 
 pub use crate::runtime_api::StatementSource;
 use crate::{Hash, Statement, Topic, MAX_ANY_TOPICS, MAX_TOPICS};
-use sp_core::Bytes;
+use sp_core::{bounded_vec::BoundedVec, Bytes, ConstU32};
 use std::collections::HashSet;
 
 /// Statement store error.
@@ -43,11 +43,11 @@ pub enum TopicFilter {
 	/// Matches all topics.
 	Any,
 	/// Matches only statements including all of the given topics.
-	/// Bytes are expected to be a 32-byte topic. Up to `4` topics can be provided.
-	MatchAll(Vec<Bytes>),
+	/// Bytes are expected to be a 32-byte topic. Up to [`MAX_TOPICS`] topics can be provided.
+	MatchAll(BoundedVec<Bytes, ConstU32<{ MAX_TOPICS as u32 }>>),
 	/// Matches statements including any of the given topics.
-	/// Bytes are expected to be a 32-byte topic. Up to `128` topics can be provided.
-	MatchAny(Vec<Bytes>),
+	/// Bytes are expected to be a 32-byte topic. Up to [`MAX_ANY_TOPICS`] topics can be provided.
+	MatchAny(BoundedVec<Bytes, ConstU32<{ MAX_ANY_TOPICS as u32 }>>),
 }
 
 /// Topic filter for statement subscriptions.
@@ -86,9 +86,6 @@ impl TryInto<CheckedTopicFilter> for TopicFilter {
 			TopicFilter::Any => Ok(CheckedTopicFilter::Any),
 			TopicFilter::MatchAll(topics) => {
 				let mut parsed_topics = HashSet::with_capacity(topics.len());
-				if topics.len() > MAX_TOPICS {
-					return Err(Error::Decode("Too many topics in MatchAll filter".into()));
-				}
 				for topic in topics {
 					if topic.0.len() != 32 {
 						return Err(Error::Decode("Invalid topic format".into()));
@@ -101,9 +98,6 @@ impl TryInto<CheckedTopicFilter> for TopicFilter {
 			},
 			TopicFilter::MatchAny(topics) => {
 				let mut parsed_topics = HashSet::with_capacity(topics.len());
-				if topics.len() > MAX_ANY_TOPICS {
-					return Err(Error::Decode("Too many topics in MatchAny filter".into()));
-				}
 				for topic in topics {
 					if topic.0.len() != 32 {
 						return Err(Error::Decode("Invalid topic format".into()));