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

Add SnapshotArchiveInfo and refactor functions in snapshot_utils (#18232)

Browse Source
This commit is contained in:
Brooks Prumo
2021-07-01 12:20:56 -05:00
committed by GitHub
parent 5e424826ba
commit 45d54b1fc6
9 changed files with 392 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rpc/src/rpc.rs
View File

@ -49,7 +49,7 @@ use {
inline_spl_token_v2_0::{SPL_TOKEN_ACCOUNT_MINT_OFFSET, SPL_TOKEN_ACCOUNT_OWNER_OFFSET},
non_circulating_supply::calculate_non_circulating_supply,
snapshot_config::SnapshotConfig,
snapshot_utils::get_highest_snapshot_archive_path,
snapshot_utils,
},
solana_sdk::{
account::{AccountSharedData, ReadableAccount},
@ -2255,8 +2255,9 @@ pub mod rpc_minimal {
meta.snapshot_config
.and_then(|snapshot_config| {
get_highest_snapshot_archive_path(&snapshot_config.snapshot_package_output_path)
.map(|(_, (slot, _, _))| slot)
snapshot_utils::get_highest_snapshot_archive_slot(
&snapshot_config.snapshot_package_output_path,
)
})
.ok_or_else(|| RpcCustomError::NoSnapshot.into())
}

7
rpc/src/rpc_service.rs
View File

@ -198,13 +198,14 @@ impl RequestMiddleware for RpcRequestMiddleware {
if let Some(ref snapshot_config) = self.snapshot_config {
if request.uri().path() == "/snapshot.tar.bz2" {
// Convenience redirect to the latest snapshot
return if let Some((snapshot_archive, _)) =
snapshot_utils::get_highest_snapshot_archive_path(
return if let Some(snapshot_archive_info) =
snapshot_utils::get_highest_snapshot_archive_info(
&snapshot_config.snapshot_package_output_path,
) {
RpcRequestMiddleware::redirect(&format!(
"/{}",
snapshot_archive
snapshot_archive_info
.path
.file_name()
.unwrap_or_else(|| std::ffi::OsStr::new(""))
.to_str()