From 551c24da5792f4452c3c555e562809e8c9e742e5 Mon Sep 17 00:00:00 2001
From: Jack May <jack@solana.com>
Date: Mon, 31 Jan 2022 23:46:04 -0800
Subject: [PATCH] nit: consistent name (#22857)

---
 program-runtime/src/invoke_context.rs | 2 +-
 program-test/src/lib.rs               | 8 ++++++--
 programs/bpf_loader/src/lib.rs        | 4 ++--
 programs/zk-token-proof/src/lib.rs    | 2 +-
 runtime/src/builtins.rs               | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/program-runtime/src/invoke_context.rs b/program-runtime/src/invoke_context.rs
index 1700dfeedd..8793284fa4 100644
--- a/program-runtime/src/invoke_context.rs
+++ b/program-runtime/src/invoke_context.rs
@@ -409,7 +409,7 @@ impl<'a> InvokeContext<'a> {
     }
 
     /// Current depth of the invocation stack
-    pub fn invoke_depth(&self) -> usize {
+    pub fn get_invoke_depth(&self) -> usize {
         self.transaction_context
             .get_instruction_context_stack_height()
     }
diff --git a/program-test/src/lib.rs b/program-test/src/lib.rs
index d3b1a00ac2..c344459d40 100644
--- a/program-test/src/lib.rs
+++ b/program-test/src/lib.rs
@@ -102,7 +102,11 @@ pub fn builtin_process_instruction(
 
     let log_collector = invoke_context.get_log_collector();
     let program_id = transaction_context.get_program_key()?;
-    stable_log::program_invoke(&log_collector, program_id, invoke_context.invoke_depth());
+    stable_log::program_invoke(
+        &log_collector,
+        program_id,
+        invoke_context.get_invoke_depth(),
+    );
 
     // Copy indices_in_instruction into a HashSet to ensure there are no duplicates
     let deduplicated_indices: HashSet<usize> = indices_in_instruction.clone().collect();
@@ -251,7 +255,7 @@ impl solana_sdk::program_stubs::SyscallStubs for SyscallStubs {
         stable_log::program_invoke(
             &log_collector,
             &instruction.program_id,
-            invoke_context.invoke_depth(),
+            invoke_context.get_invoke_depth(),
         );
 
         let signers = signers_seeds
diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
index 4497fb4598..cd78190e98 100644
--- a/programs/bpf_loader/src/lib.rs
+++ b/programs/bpf_loader/src/lib.rs
@@ -307,7 +307,7 @@ fn process_instruction_common(
     if program.executable()? {
         debug_assert_eq!(
             first_instruction_account,
-            1 - (invoke_context.invoke_depth() > 1) as usize,
+            1 - (invoke_context.get_invoke_depth() > 1) as usize,
         );
 
         if !check_loader_id(&program.owner()?) {
@@ -1045,7 +1045,7 @@ impl Executor for BpfExecutor {
     ) -> Result<(), InstructionError> {
         let log_collector = invoke_context.get_log_collector();
         let compute_meter = invoke_context.get_compute_meter();
-        let invoke_depth = invoke_context.invoke_depth();
+        let invoke_depth = invoke_context.get_invoke_depth();
 
         let mut serialize_time = Measure::start("serialize");
         let program_id = *invoke_context.transaction_context.get_program_key()?;
diff --git a/programs/zk-token-proof/src/lib.rs b/programs/zk-token-proof/src/lib.rs
index b18c075fa9..ab8d3706c8 100644
--- a/programs/zk-token-proof/src/lib.rs
+++ b/programs/zk-token-proof/src/lib.rs
@@ -28,7 +28,7 @@ pub fn process_instruction(
     input: &[u8],
     invoke_context: &mut InvokeContext,
 ) -> Result<(), InstructionError> {
-    if invoke_context.invoke_depth() != 1 {
+    if invoke_context.get_invoke_depth() != 1 {
         // Not supported as an inner instruction
         return Err(InstructionError::UnsupportedProgramId);
     }
diff --git a/runtime/src/builtins.rs b/runtime/src/builtins.rs
index 73cfb83f5c..68ba99670d 100644
--- a/runtime/src/builtins.rs
+++ b/runtime/src/builtins.rs
@@ -20,7 +20,7 @@ fn process_instruction_with_program_logging(
 ) -> Result<(), InstructionError> {
     let logger = invoke_context.get_log_collector();
     let program_id = invoke_context.transaction_context.get_program_key()?;
-    stable_log::program_invoke(&logger, program_id, invoke_context.invoke_depth());
+    stable_log::program_invoke(&logger, program_id, invoke_context.get_invoke_depth());
 
     let result = process_instruction(first_instruction_account, instruction_data, invoke_context);