From 01b00bc5931146ce02093784047a4812b22ff415 Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <teulberg@gmail.com>
Date: Fri, 13 Aug 2021 11:14:00 -0600
Subject: [PATCH] Fix crossed PRs; remove deprecated fee_calculator usage
 (#19228)

---
 runtime/src/snapshot_utils.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/runtime/src/snapshot_utils.rs b/runtime/src/snapshot_utils.rs
index f2e5f97149..487294cde2 100644
--- a/runtime/src/snapshot_utils.rs
+++ b/runtime/src/snapshot_utils.rs
@@ -2903,8 +2903,9 @@ mod tests {
             lamports_to_transfer,
             bank2.last_blockhash(),
         );
-        let (_blockhash, fee_calculator) = bank2.last_blockhash_with_fee_calculator();
-        let fee = fee_calculator.calculate_fee(tx.message());
+        let fee = bank2
+            .get_fee_for_message(&bank2.last_blockhash(), tx.message())
+            .unwrap();
         let tx = system_transaction::transfer(
             &key1,
             &key2.pubkey(),