Naming nits (#7798)

automerge
This commit is contained in:
Jack May
2020-01-14 13:38:17 -08:00
committed by Grimes
parent e6af4511a8
commit 5f4e0c7e3e
4 changed files with 20 additions and 17 deletions

View File

@@ -67,7 +67,7 @@ fn library_open(path: &PathBuf) -> std::io::Result<Library> {
pub fn invoke_entrypoint(
program_id: &Pubkey,
keyed_accounts: &mut [KeyedAccount],
ix_data: &[u8],
instruction_data: &[u8],
symbol_cache: &SymbolCache,
) -> Result<(), InstructionError> {
// dispatch it
@@ -75,7 +75,7 @@ pub fn invoke_entrypoint(
let name_vec = &names[0].account.data;
if let Some(entrypoint) = symbol_cache.read().unwrap().get(name_vec) {
unsafe {
return entrypoint(program_id, params, ix_data);
return entrypoint(program_id, params, instruction_data);
}
}
let name = match str::from_utf8(name_vec) {
@@ -101,7 +101,7 @@ pub fn invoke_entrypoint(
return Err(InstructionError::GenericError);
}
};
let ret = entrypoint(program_id, params, ix_data);
let ret = entrypoint(program_id, params, instruction_data);
symbol_cache
.write()
.unwrap()