From d2bd6c72aaca47b05064e545544518f63fde5af6 Mon Sep 17 00:00:00 2001
From: Andrew Fitzgerald <apfitzge@gmail.com>
Date: Mon, 15 May 2023 08:56:57 -0700
Subject: [PATCH] Keep signal_receiver in scope (#31625)

---
 core/benches/consumer.rs           | 19 ++++++++++++-------
 core/src/banking_stage/consumer.rs |  4 ++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/core/benches/consumer.rs b/core/benches/consumer.rs
index f70aa88174..9fbbe0d960 100644
--- a/core/benches/consumer.rs
+++ b/core/benches/consumer.rs
@@ -84,11 +84,11 @@ fn create_consumer(poh_recorder: &RwLock<PohRecorder>) -> Consumer {
 
 struct BenchFrame {
     bank: Arc<Bank>,
-    _ledger_path: TempDir,
+    ledger_path: TempDir,
     exit: Arc<AtomicBool>,
     poh_recorder: Arc<RwLock<PohRecorder>>,
     poh_service: PohService,
-    _signal_receiver: Receiver<(Arc<Bank>, (Entry, u64))>,
+    signal_receiver: Receiver<(Arc<Bank>, (Entry, u64))>,
 }
 
 fn setup() -> BenchFrame {
@@ -120,29 +120,34 @@ fn setup() -> BenchFrame {
 
     BenchFrame {
         bank,
-        _ledger_path: ledger_path,
+        ledger_path,
         exit,
         poh_recorder,
         poh_service,
-        _signal_receiver: signal_receiver,
+        signal_receiver,
     }
 }
 
 fn bench_process_and_record_transactions(bencher: &mut Bencher, batch_size: usize) {
     let BenchFrame {
         bank,
-        _ledger_path,
+        ledger_path: _ledger_path,
         exit,
         poh_recorder,
         poh_service,
-        ..
+        signal_receiver: _signal_receiver,
     } = setup();
     let consumer = create_consumer(&poh_recorder);
     let transactions = create_transactions(&bank, 2_usize.pow(20));
     let mut transaction_iter = transactions.chunks(batch_size);
 
     bencher.iter(move || {
-        consumer.process_and_record_transactions(&bank, transaction_iter.next().unwrap(), 0);
+        let summary =
+            consumer.process_and_record_transactions(&bank, transaction_iter.next().unwrap(), 0);
+        assert!(summary
+            .execute_and_commit_transactions_output
+            .commit_transactions_result
+            .is_ok());
     });
 
     exit.store(true, Ordering::Relaxed);
diff --git a/core/src/banking_stage/consumer.rs b/core/src/banking_stage/consumer.rs
index e9beea4413..24945c6416 100644
--- a/core/src/banking_stage/consumer.rs
+++ b/core/src/banking_stage/consumer.rs
@@ -43,7 +43,7 @@ pub struct ProcessTransactionBatchOutput {
     cost_model_throttled_transactions_count: usize,
     // Amount of time spent running the cost model
     cost_model_us: u64,
-    execute_and_commit_transactions_output: ExecuteAndCommitTransactionsOutput,
+    pub execute_and_commit_transactions_output: ExecuteAndCommitTransactionsOutput,
 }
 
 pub struct ExecuteAndCommitTransactionsOutput {
@@ -60,7 +60,7 @@ pub struct ExecuteAndCommitTransactionsOutput {
     retryable_transaction_indexes: Vec<usize>,
     // A result that indicates whether transactions were successfully
     // committed into the Poh stream.
-    commit_transactions_result: Result<Vec<CommitTransactionDetails>, PohRecorderError>,
+    pub commit_transactions_result: Result<Vec<CommitTransactionDetails>, PohRecorderError>,
     execute_and_commit_timings: LeaderExecuteAndCommitTimings,
     error_counters: TransactionErrorMetrics,
 }