nudge

programs/bpf/c/src/invoked/instruction.h

@@ -0,0 +1,10 @@
+/**
+ * @brief Instruction definitions for the invoked program
+ */
+
+const int TEST_VERIFY_TRANSLATIONS = 0;
+const int TEST_RETURN_ERROR = 1;
+const int TEST_DERIVED_SIGNERS = 2;
+const int TEST_VERIFY_NESTED_SIGNERS = 3;
+const int TEST_VERIFY_WRITER = 4;
+const int TEST_NESTED_INVOKE = 5;

programs/bpf_loader/src/syscalls.rs

@@ -697,8 +697,7 @@ fn call<'a>(
     let callee_program_id = message.account_keys[callee_program_id_index];
     let caller_program_id = invoke_context
         .get_caller()
-        .map_err(|err| SyscallError::InstructionError(err))?
-        .into();
+        .map_err(SyscallError::InstructionError)?;
     let (accounts, refs) = syscall.translate_accounts(
         &message,
         account_infos_addr,