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

Replace several .expect() statements with error handling (#33783)

This commit is contained in:
steviez 2023-10-24 23:48:21 +02:00 committed by GitHub
parent 612e8e8457
commit 9ffbe2afd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/validator.rs
View File

@ -926,7 +926,7 @@ impl Validator {
&identity_keypair, &identity_keypair,
node.info node.info
.tpu(Protocol::UDP) .tpu(Protocol::UDP)
.expect("Operator must spin up node with valid TPU address") .map_err(|err| format!("Invalid TPU address: {err:?}"))?
.ip(), .ip(),
)), )),
Some((&staked_nodes, &identity_keypair.pubkey())), Some((&staked_nodes, &identity_keypair.pubkey())),
@ -1181,7 +1181,7 @@ impl Validator {
node.sockets.tvu_quic, node.sockets.tvu_quic,
node.info node.info
.tvu(Protocol::QUIC) .tvu(Protocol::QUIC)
.expect("Operator must spin up node with valid QUIC TVU address") .map_err(|err| format!("Invalid QUIC TVU address: {err:?}"))?
.ip(), .ip(),
turbine_quic_endpoint_sender, turbine_quic_endpoint_sender,
bank_forks.clone(), bank_forks.clone(),
@ -1206,7 +1206,7 @@ impl Validator {
node.sockets.serve_repair_quic, node.sockets.serve_repair_quic,
node.info node.info
.serve_repair(Protocol::QUIC) .serve_repair(Protocol::QUIC)
.expect("Operator must spin up node with valid QUIC serve-repair address") .map_err(|err| format!("Invalid QUIC serve-repair address: {err:?}"))?
.ip(), .ip(),
repair_quic_endpoint_sender, repair_quic_endpoint_sender,
bank_forks.clone(), bank_forks.clone(),
@ -1741,7 +1741,8 @@ fn load_blockstore(
completed_slots_receiver, completed_slots_receiver,
.. ..
} = Blockstore::open_with_signal(ledger_path, blockstore_options_from_config(config)) } = Blockstore::open_with_signal(ledger_path, blockstore_options_from_config(config))
.expect("Failed to open ledger database"); .map_err(|err| format!("Failed to open Blockstore: {err:?}"))?;
blockstore.shred_timing_point_sender = poh_timing_point_sender; blockstore.shred_timing_point_sender = poh_timing_point_sender;
// following boot sequence (esp BankForks) could set root. so stash the original value // following boot sequence (esp BankForks) could set root. so stash the original value
// of blockstore root away here as soon as possible. // of blockstore root away here as soon as possible.