Skip to content

Commit

Permalink
fix merge resolv bug
Browse files Browse the repository at this point in the history
  • Loading branch information
rnovikov committed Jan 30, 2025
1 parent cef7a72 commit acbb6c3
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions evm_loader/lib/src/rpc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ mod validator_client;
use crate::commands::get_config::GetConfigResponse;

pub use db_call_client::CallDbClient;
use solana_sdk::sysvar::{Sysvar, SysvarId};
use tracing::trace;
pub use validator_client::CloneRpcClient;

Expand Down Expand Up @@ -82,19 +81,6 @@ pub trait Rpc {
async fn get_multiple_accounts(&self, pubkeys: &[Pubkey])
-> ClientResult<Vec<Option<Account>>>;

async fn get_sysvar<T>(&self) -> NeonResult<T>
where
T: Sysvar + SysvarId,
{
let account = self
.get_account(&T::id())
.await?
.ok_or(NeonError::AccountNotFound(T::id()))?;

let sysvar = bincode::deserialize::<T>(&account.data)?;
Ok(sysvar)
}

async fn get_deactivated_solana_features(&self) -> ClientResult<Vec<Pubkey>>;
}

Expand All @@ -119,7 +105,6 @@ macro_rules! e {
};
}

use crate::types::programs_cache::get_programdata_slot_from_account;
pub(crate) use e;

pub(crate) async fn check_account_for_fee(
Expand Down

0 comments on commit acbb6c3

Please sign in to comment.