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

runtime: Move `From<AddressLookupError>` from sdk (#141) 

sdk: Move `From<AddressLookupError>` into runtime
This commit is contained in:
Jon C 2024-03-08 11:02:33 +01:00 committed by GitHub
parent c0239c8eff
commit 377e1f9112
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
runtime/src/bank/address_lookup_table.rs
View File

@ -10,6 +10,17 @@ use {
},
};
fn into_address_loader_error(err: AddressLookupError) -> AddressLoaderError {
match err {
AddressLookupError::LookupTableAccountNotFound => {
AddressLoaderError::LookupTableAccountNotFound
}
AddressLookupError::InvalidAccountOwner => AddressLoaderError::InvalidAccountOwner,
AddressLookupError::InvalidAccountData => AddressLoaderError::InvalidAccountData,
AddressLookupError::InvalidLookupIndex => AddressLoaderError::InvalidLookupIndex,
}
}
impl AddressLoader for &Bank {
fn load_addresses(
self,
@ -23,15 +34,18 @@ impl AddressLoader for &Bank {
.get_slot_hashes()
.map_err(|_| AddressLoaderError::SlotHashesSysvarNotFound)?;
Ok(address_table_lookups
address_table_lookups
.iter()
.map(|address_table_lookup| {
self.rc.accounts.load_lookup_table_addresses(
&self.ancestors,
address_table_lookup,
&slot_hashes,
)
self.rc
.accounts
.load_lookup_table_addresses(
&self.ancestors,
address_table_lookup,
&slot_hashes,
)
.map_err(into_address_loader_error)
})
.collect::<Result<_, AddressLookupError>>()?)
.collect::<Result<_, _>>()
}
}

14
sdk/program/src/address_lookup_table/error.rs
View File

@ -1,5 +1,3 @@
#[cfg(not(target_os = "solana"))]
use solana_program::message::AddressLoaderError;
use thiserror::Error;
#[derive(Debug, Error, PartialEq, Eq, Clone)]
@ -20,15 +18,3 @@ pub enum AddressLookupError {
#[error("Address lookup contains an invalid index")]
InvalidLookupIndex,
}
#[cfg(not(target_os = "solana"))]
impl From<AddressLookupError> for AddressLoaderError {
fn from(err: AddressLookupError) -> Self {
match err {
AddressLookupError::LookupTableAccountNotFound => Self::LookupTableAccountNotFound,
AddressLookupError::InvalidAccountOwner => Self::InvalidAccountOwner,
AddressLookupError::InvalidAccountData => Self::InvalidAccountData,
AddressLookupError::InvalidLookupIndex => Self::InvalidLookupIndex,
}
}
}