Comments

crates/shared/src/testing/generation.rs

@@ -153,7 +153,7 @@ where
                     let mut data = vec![0; txn_size];
                     rng.fill(data.as_mut_slice());
                     let transaction = TransactionPayload {
-                        number: self.txn_nonce,
+                        index: self.txn_nonce,
                         created: now,
                         data,
                     };
@@ -177,7 +177,7 @@ where
                     rng.fill(data.as_mut_slice());
 
                     let transaction = TransactionPayload {
-                        number: self.txn_nonce,
+                        index: self.txn_nonce,
                         created: now,
                         data,
                     };
@@ -202,6 +202,7 @@ where
     type Event = Event<Types>;
 
     async fn handle_event(&mut self, (event, id): (Self::Event, usize)) -> anyhow::Result<()> {
+        // We only need to handle events from one node
         if id != 0 {
             return Ok(());
         }
@@ -246,7 +247,8 @@ where
                                 builder::Error::Request(request_error) => {
                                     panic!("Builder API not available: {request_error}")
                                 }
-                                // If the builder returns an error, we will re-try on the next view
+                                // If the builder returns an error, we will re-submit this transaction
+                                // on the next view, so we return it to the queue and break
                                 error => {
                                     tracing::warn!(?error, "Builder API error");
                                     self.txn_queue.push_front(txn);

crates/shared/src/testing/mod.rs

@@ -20,7 +20,7 @@ pub mod validation;
 pub struct TransactionPayload {
     /// Monotonically increasing transaction number, to uniquely
     /// identify the transaction and track transaction ordering
-    number: usize,
+    index: usize,
     /// Time of transaction creation
     created: DateTime<Local>,
     /// Arbitrary data to pad transaction length with
@@ -35,7 +35,7 @@ impl TransactionPayload {
         let mut data = Vec::with_capacity(data_bytes);
         thread_rng().fill(data.as_mut_slice());
         Self {
-            number,
+            index: number,
             created: Local::now(),
             data,
         }

crates/shared/src/testing/validation.rs

@@ -75,6 +75,7 @@ where
     type Event = Event<Types>;
 
     async fn handle_event(&mut self, (event, id): (Self::Event, usize)) -> anyhow::Result<()> {
+        // We only need to handle events from one node
         if id != 0 {
             return Ok(());
         }
@@ -112,7 +113,7 @@ where
         if let Err(e) = self
             .txn_history
             .iter()
-            .map(|txn| txn.payload.number as i64)
+            .map(|txn| txn.payload.index as i64)
             .try_fold(-1, |prev, next| {
                 if prev + 1 == next {
                     Ok(next)