gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moves InvokeContext::return_data to TransactionContext. (#22411)

Browse Source
This commit is contained in:
Alexander Meißner
2022-01-10 18:26:51 +01:00
committed by GitHub
parent 9bc2592da1
commit aadf4b9b63
5 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
program-runtime/src/invoke_context.rs
View File

@ -181,7 +181,6 @@ impl<'a> StackFrame<'a> {
pub struct InvokeContext<'a> {
pub transaction_context: &'a mut TransactionContext,
pub return_data: (Pubkey, Vec<u8>),
invoke_stack: Vec<StackFrame<'a>>,
rent: Rent,
pre_accounts: Vec<PreAccount>,
@ -218,7 +217,6 @@ impl<'a> InvokeContext<'a> {
) -> Self {
Self {
transaction_context,
return_data: (Pubkey::default(), Vec::new()),
invoke_stack: Vec::with_capacity(compute_budget.max_invoke_depth),
rent,
pre_accounts: Vec::new(),
@ -835,7 +833,8 @@ impl<'a> InvokeContext<'a> {
.and_then(|_| {
let mut process_executable_chain_time =
Measure::start("process_executable_chain_time");
self.return_data = (program_id, Vec::new());
self.transaction_context
.set_return_data(program_id, Vec::new())?;
let pre_remaining_units = self.compute_meter.borrow().get_remaining();
let execution_result = self.process_executable_chain(instruction_data);
let post_remaining_units = self.compute_meter.borrow().get_remaining();