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

Remove generic

This commit is contained in:
Carl 2020-03-15 21:28:47 -07:00 committed by Michael Vines
parent 7029c88305
commit 009c124fac
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/replay_stage.rs
View File

@ -12,6 +12,7 @@ use crate::{
}; };
use solana_ledger::{ use solana_ledger::{
bank_forks::BankForks, bank_forks::BankForks,
block_error::BlockError,
blockstore::Blockstore, blockstore::Blockstore,
blockstore_processor::{ blockstore_processor::{
self, BlockstoreProcessorError, ConfirmationProgress, ConfirmationTiming, self, BlockstoreProcessorError, ConfirmationProgress, ConfirmationTiming,
@ -629,14 +630,17 @@ impl ReplayStage {
// errors related to the slot being purged // errors related to the slot being purged
let slot = bank.slot(); let slot = bank.slot();
warn!("Fatal replay error in slot: {}, err: {:?}", slot, err); warn!("Fatal replay error in slot: {}, err: {:?}", slot, err);
if err.is_severity_error() { if matches!(
datapoint_error!( err,
BlockstoreProcessorError::InvalidBlock(BlockError::InvalidTickCount)
) {
datapoint_info!(
"replay-stage-mark_dead_slot", "replay-stage-mark_dead_slot",
("error", format!("error: {:?}", err), String), ("error", format!("error: {:?}", err), String),
("slot", slot, i64) ("slot", slot, i64)
); );
} else { } else {
datapoint_info!( datapoint_error!(
"replay-stage-mark_dead_slot", "replay-stage-mark_dead_slot",
("error", format!("error: {:?}", err), String), ("error", format!("error: {:?}", err), String),
("slot", slot, i64) ("slot", slot, i64)
@ -1296,7 +1300,6 @@ pub(crate) mod tests {
use crossbeam_channel::unbounded; use crossbeam_channel::unbounded;
use solana_client::rpc_response::{RpcEncodedTransaction, RpcTransactionWithStatusMeta}; use solana_client::rpc_response::{RpcEncodedTransaction, RpcTransactionWithStatusMeta};
use solana_ledger::{ use solana_ledger::{
block_error::BlockError,
blockstore::make_slot_entries, blockstore::make_slot_entries,
blockstore::{entries_to_test_shreds, BlockstoreError}, blockstore::{entries_to_test_shreds, BlockstoreError},
create_new_tmp_ledger, create_new_tmp_ledger,

9
ledger/src/blockstore_processor.rs
View File

@ -260,15 +260,6 @@ pub enum BlockstoreProcessorError {
InvalidHardFork(Slot), InvalidHardFork(Slot),
} }
impl BlockstoreProcessorError {
pub fn is_severity_error(&self) -> bool {
!matches!(
self,
BlockstoreProcessorError::InvalidBlock(BlockError::InvalidTickCount)
)
}
}
/// Callback for accessing bank state while processing the blockstore /// Callback for accessing bank state while processing the blockstore
pub type ProcessCallback = Arc<dyn Fn(&Bank) -> () + Sync + Send>; pub type ProcessCallback = Arc<dyn Fn(&Bank) -> () + Sync + Send>;