Increments pending_items on tower-batch-control Workers by item_size() instead of 1, and increases halo2 max batch size from 2 to 64

Author: arya2

tower-batch-control/src/worker.rs

@@ -144,10 +144,9 @@ where
 
         match self.service.ready().await {
             Ok(svc) => {
+                self.pending_items += req.item_size();
                 let rsp = svc.call(req.into());
                 let _ = tx.send(Ok(rsp));
-
-                self.pending_items += 1;
             }
             Err(e) => {
                 self.failed(e.into());

zebra-consensus/src/primitives/halo2.rs

@@ -28,47 +28,22 @@ use tower_fallback::Fallback;
 
 use super::spawn_fifo;
 
-// #[cfg(test)]
-// mod tests;
-
 /// Adjusted batch size for halo2 batches.
 ///
 /// Unlike other batch verifiers, halo2 has aggregate proofs.
 /// This means that there can be hundreds of actions verified by some proofs,
 /// but just one action in others.
 ///
-/// To compensate for larger proofs, we decrease the batch size.
-///
-/// We also decrease the batch size for these reasons:
-/// - the default number of actions in `zcashd` is 2,
-/// - halo2 proofs take longer to verify than Sapling proofs, and
-/// - transactions with many actions generate very large proofs.
-///
-/// # TODO
-///
-/// Count each halo2 action as a batch item.
-/// We could increase the batch item count by the action count each time a batch request
-/// is received, which would reduce batch size, but keep the batch queue size larger.
-const HALO2_MAX_BATCH_SIZE: usize = 2;
-
-/* TODO: implement batch verification
-
-/// The type of the batch verifier.
-type BatchVerifier = plonk::BatchVerifier<vesta::Affine>;
- */
+/// To compensate for larger proofs, we process the batch once there are over
+/// [`HALO2_MAX_BATCH_SIZE`] total actions among pending items in the queue.
+const HALO2_MAX_BATCH_SIZE: usize = super::MAX_BATCH_SIZE;
 
 /// The type of verification results.
 type VerifyResult = bool;
 
 /// The type of the batch sender channel.
 type Sender = watch::Sender<Option<VerifyResult>>;
 
-/* TODO: implement batch verification
-
-/// The type of a raw verifying key.
-/// This is the key used to verify batches.
-pub type BatchVerifyingKey = VerifyingKey<vesta::Affine>;
- */
 /// Temporary substitute type for fake batch verification.
 ///
 /// TODO: implement batch verification
@@ -83,13 +58,6 @@ lazy_static::lazy_static! {
     pub static ref VERIFYING_KEY: ItemVerifyingKey = ItemVerifyingKey::build();
 }
 
-// === TEMPORARY BATCH HALO2 SUBSTITUTE ===
-//
-// These types are meant to be API compatible with the batch verification APIs
-// in bellman::groth16::batch, reddsa::batch, redjubjub::batch, and
-// ed25519-zebra::batch. Once Halo2 batch proof verification math and
-// implementation is available, this code can be replaced with that.
-
 /// A Halo2 verification item, used as the request type of the service.
 #[derive(Clone, Debug)]
 pub struct Item {