blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Overload with_mock_invoke_context with custom BuiltinPrograms option (#31347)

This commit is contained in:
Dmitri Makarov 2023-04-26 10:45:33 -04:00 committed by GitHub
parent c05d1d5c51
commit c658d4e737
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 60 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -868,8 +868,13 @@ impl<'a> InvokeContext<'a> {
}
#[macro_export]
macro_rules! with_mock_invoke_context {
($invoke_context:ident, $transaction_context:ident, $transaction_accounts:expr) => {
macro_rules! with_mock_invoke_context_and_builtin_programs {
(
$invoke_context:ident,
$transaction_context:ident,
$transaction_accounts:expr,
$builtin_programs:expr
) => {
use {
solana_sdk::{
account::ReadableAccount, feature_set::FeatureSet, hash::Hash, sysvar::rent::Rent,
@ -877,9 +882,9 @@ macro_rules! with_mock_invoke_context {
},
std::{cell::RefCell, rc::Rc, sync::Arc},
$crate::{
builtin_program::BuiltinPrograms, compute_budget::ComputeBudget,
executor_cache::TransactionExecutorCache, invoke_context::InvokeContext,
log_collector::LogCollector, sysvar_cache::SysvarCache,
compute_budget::ComputeBudget, executor_cache::TransactionExecutorCache,
invoke_context::InvokeContext, log_collector::LogCollector,
sysvar_cache::SysvarCache,
},
};
let compute_budget = ComputeBudget::default();
@ -890,7 +895,6 @@ macro_rules! with_mock_invoke_context {
compute_budget.max_instruction_trace_length,
);
$transaction_context.enable_cap_accounts_data_allocations_per_transaction();
let builtin_programs = BuiltinPrograms::default();
let mut sysvar_cache = SysvarCache::default();
sysvar_cache.fill_missing_entries(|pubkey, callback| {
for index in 0..$transaction_context.get_number_of_accounts() {
@ -912,7 +916,7 @@ macro_rules! with_mock_invoke_context {
let mut $invoke_context = InvokeContext::new(
&mut $transaction_context,
Rent::default(),
&builtin_programs,
$builtin_programs,
&sysvar_cache,
Some(LogCollector::new_ref()),
compute_budget,
@ -925,6 +929,37 @@ macro_rules! with_mock_invoke_context {
};
}
#[macro_export]
macro_rules! with_mock_invoke_context {
(
$invoke_context:ident,
$transaction_context:ident,
$transaction_accounts:expr,
$builtin_programs:expr
) => {
use $crate::with_mock_invoke_context_and_builtin_programs;
with_mock_invoke_context_and_builtin_programs!(
$invoke_context,
$transaction_context,
$transaction_accounts,
$builtin_programs
);
};
($invoke_context:ident, $transaction_context:ident, $transaction_accounts:expr) => {
use $crate::{
builtin_program::BuiltinPrograms, with_mock_invoke_context_and_builtin_programs,
};
let builtin_programs = BuiltinPrograms::default();
with_mock_invoke_context_and_builtin_programs!(
$invoke_context,
$transaction_context,
$transaction_accounts,
&builtin_programs
);
};
}
pub fn mock_process_instruction<F: FnMut(&mut InvokeContext), G: FnMut(&mut InvokeContext)>(
loader_id: &Pubkey,
mut program_indices: Vec<IndexOfAccount>,
@ -963,9 +998,13 @@ pub fn mock_process_instruction<F: FnMut(&mut InvokeContext), G: FnMut(&mut Invo
program_indices.insert(0, transaction_accounts.len() as IndexOfAccount);
let processor_account = AccountSharedData::new(0, 0, &native_loader::id());
transaction_accounts.push((*loader_id, processor_account));
with_mock_invoke_context!(invoke_context, transaction_context, transaction_accounts);
let builtin_programs = BuiltinPrograms::new_mock(*loader_id, process_instruction);
invoke_context.builtin_programs = &builtin_programs;
with_mock_invoke_context!(
invoke_context,
transaction_context,
transaction_accounts,
&builtin_programs
);
pre_adjustments(&mut invoke_context);
let result = invoke_context.process_instruction(
instruction_data,
@ -1213,9 +1252,13 @@ mod tests {
is_writable: instruction_account_index < 2,
})
.collect::<Vec<_>>();
with_mock_invoke_context!(invoke_context, transaction_context, transaction_accounts);
let builtin_programs = BuiltinPrograms::new_mock(callee_program_id, process_instruction);
invoke_context.builtin_programs = &builtin_programs;
with_mock_invoke_context!(
invoke_context,
transaction_context,
transaction_accounts,
&builtin_programs
);
// Account modification tests
let cases = vec![
@ -1355,9 +1398,13 @@ mod tests {
is_writable: false,
},
];
with_mock_invoke_context!(invoke_context, transaction_context, transaction_accounts);
let builtin_programs = BuiltinPrograms::new_mock(program_key, process_instruction);
invoke_context.builtin_programs = &builtin_programs;
with_mock_invoke_context!(
invoke_context,
transaction_context,
transaction_accounts,
&builtin_programs
);
// Test: Resize the account to *the same size*, so not consuming any additional size; this must succeed
{