From aabd2ac2cc763d8bc8d1049c78541ce773366796 Mon Sep 17 00:00:00 2001
From: Ryo Onodera <ryoqun@gmail.com>
Date: Sun, 15 Dec 2024 16:12:47 +0900
Subject: [PATCH] Call wait_for_completed_scheduler in banking simulator

---
 core/Cargo.toml                | 1 +
 core/src/banking_simulation.rs | 4 ++++
 programs/sbf/Cargo.lock        | 2 ++
 svm/examples/Cargo.lock        | 2 ++
 4 files changed, 9 insertions(+)

diff --git a/core/Cargo.toml b/core/Cargo.toml
index 0143180ced5b4d..164a28b77b1b1d 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -17,6 +17,7 @@ codecov = { repository = "solana-labs/solana", branch = "master", service = "git
 ahash = { workspace = true }
 anyhow = { workspace = true }
 arrayvec = { workspace = true }
+assert_matches = { workspace = true }
 base64 = { workspace = true }
 bincode = { workspace = true }
 bs58 = { workspace = true }
diff --git a/core/src/banking_simulation.rs b/core/src/banking_simulation.rs
index a1acdf81cef210..815b8e455df482 100644
--- a/core/src/banking_simulation.rs
+++ b/core/src/banking_simulation.rs
@@ -10,6 +10,7 @@ use {
         },
         validator::BlockProductionMethod,
     },
+    assert_matches::assert_matches,
     bincode::deserialize_from,
     crossbeam_channel::{unbounded, Sender},
     itertools::Itertools,
@@ -452,6 +453,9 @@ impl SimulatorLoop {
                 info!("Bank::new_from_parent()!");
 
                 logger.log_jitter(&bank);
+                if let Some((result, _execute_timings)) = bank.wait_for_completed_scheduler() {
+                    assert_matches!(result, Ok(()));
+                }
                 bank.freeze();
                 let new_slot = if bank.slot() == self.parent_slot {
                     info!("initial leader block!");
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
index 53dd530b87d7ab..f2cdb82fdf82ca 100644
--- a/programs/sbf/Cargo.lock
+++ b/programs/sbf/Cargo.lock
@@ -5436,6 +5436,7 @@ dependencies = [
  "ahash 0.8.11",
  "anyhow",
  "arrayvec",
+ "assert_matches",
  "base64 0.22.1",
  "bincode",
  "bs58",
@@ -6213,6 +6214,7 @@ dependencies = [
  "bincode",
  "bv",
  "caps",
+ "crossbeam-channel",
  "curve25519-dalek 4.1.3",
  "dlopen2",
  "fnv",
diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock
index 7cddb2847f6420..11d1ea43c736d0 100644
--- a/svm/examples/Cargo.lock
+++ b/svm/examples/Cargo.lock
@@ -5287,6 +5287,7 @@ dependencies = [
  "ahash 0.8.11",
  "anyhow",
  "arrayvec",
+ "assert_matches",
  "base64 0.22.1",
  "bincode",
  "bs58",
@@ -6033,6 +6034,7 @@ dependencies = [
  "bincode",
  "bv",
  "caps",
+ "crossbeam-channel",
  "curve25519-dalek 4.1.3",
  "dlopen2",
  "fnv",