[core] plumb table ID to flush

crates/core/src/constraint_system/channel.rs

@@ -57,7 +57,7 @@ use binius_math::MultilinearPoly;
 use itertools::izip;
 
 use super::error::{Error, VerificationError};
-use crate::{oracle::OracleId, witness::MultilinearExtensionIndex};
+use crate::{constraint_system::TableId, oracle::OracleId, witness::MultilinearExtensionIndex};
 
 pub type ChannelId = usize;
 
@@ -68,6 +68,7 @@ pub enum OracleOrConst<F: Field> {
 }
 #[derive(Debug, Clone, SerializeBytes, DeserializeBytes)]
 pub struct Flush<F: TowerField> {
+	pub table_id: TableId,
 	pub oracles: Vec<OracleOrConst<F>>,
 	pub channel_id: ChannelId,
 	pub direction: FlushDirection,
@@ -125,7 +126,9 @@ where
 			direction,
 			ref selectors,
 			multiplicity,
+			table_id,
 		} = flush;
+		let _ = table_id;
 
 		if channel_id > max_channel_id {
 			return Err(Error::ChannelIdOutOfRange {

crates/core/src/constraint_system/prove.rs

@@ -320,6 +320,7 @@ where
 	let mixing_challenge = transcript.sample();
 	let permutation_challenges = transcript.sample_vec(channel_count);
 
+	flushes.retain(|flush| table_sizes[flush.table_id] > 0);
 	flushes.sort_by_key(|flush| flush.channel_id);
 	let flush_oracle_ids =
 		make_flush_oracles(&mut oracles, &flushes, mixing_challenge, &permutation_challenges)?;

crates/core/src/constraint_system/tests.rs

@@ -39,6 +39,7 @@ fn test_make_masked_flush_witnesses_handles_small_n_vars() {
 		.unwrap();
 
 	let flush = Flush {
+		table_id: 0,
 		oracles: vec![OracleOrConst::<F>::Oracle(poly_id)],
 		channel_id: 0,
 		direction: FlushDirection::Push,

crates/core/src/constraint_system/verify.rs

@@ -172,6 +172,7 @@ where
 	// TODO(cryptographers): Find a way to sample less randomness
 	let permutation_challenges = transcript.sample_vec(channel_count);
 
+	flushes.retain(|flush| table_sizes[flush.table_id] > 0);
 	flushes.sort_by_key(|flush| flush.channel_id);
 	let flush_oracle_ids =
 		make_flush_oracles(&mut oracles, &flushes, mixing_challenge, &permutation_challenges)?;

crates/m3/src/builder/constraint_system.rs

@@ -335,6 +335,7 @@ impl<F: TowerField> ConstraintSystem<F> {
 					.collect::<Vec<_>>();
 
 					compiled_flushes.push(CompiledFlush {
+						table_id: table.id(),
 						oracles: flush_oracles,
 						channel_id: *channel_id,
 						direction: *direction,