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

Remove Option<_> from Blockstore::get_rooted_block_time() return type (#33955) 

Instead of returning Result<Option<UnixTimestamp>>, return
Result<UnixTimestamp> and map None to an error. This makes the return
type similar to that of Blockstore::get_rooted_block().
This commit is contained in:
steviez 2023-11-06 12:56:10 -06:00 committed by GitHub
parent 6624a09d38
commit ee29647f67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ledger/src/blockstore.rs
View File

@ -1967,14 +1967,18 @@ impl Blockstore {
self.blocktime_cf.get(slot)
}
pub fn get_rooted_block_time(&self, slot: Slot) -> Result<Option<UnixTimestamp>> {
pub fn get_rooted_block_time(&self, slot: Slot) -> Result<UnixTimestamp> {
datapoint_info!(
"blockstore-rpc-api",
("method", "get_rooted_block_time", String)
);
let _lock = self.check_lowest_cleanup_slot(slot)?;
if self.is_root(slot) {
return self.blocktime_cf.get(slot);
return self
.blocktime_cf
.get(slot)?
.ok_or(BlockstoreError::SlotUnavailable);
}
Err(BlockstoreError::SlotNotRooted)
}

4
rpc/src/rpc.rs
View File

@ -1323,7 +1323,7 @@ impl JsonRpcRequestProcessor {
{
let result = self.blockstore.get_rooted_block_time(slot);
self.check_blockstore_root(&result, slot)?;
if result.is_err() || matches!(result, Ok(None)) {
if result.is_err() {
if let Some(bigtable_ledger_storage) = &self.bigtable_ledger_storage {
let bigtable_result = bigtable_ledger_storage.get_confirmed_block(slot).await;
self.check_bigtable_result(&bigtable_result)?;
@ -1333,7 +1333,7 @@ impl JsonRpcRequestProcessor {
}
}
self.check_slot_cleaned_up(&result, slot)?;
Ok(result.ok().unwrap_or(None))
Ok(result.ok())
} else {
let r_bank_forks = self.bank_forks.read().unwrap();
if let Some(bank) = r_bank_forks.get(slot) {