Skip to content

Sanitize error messages for terminal #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benthecarman wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −8
Open

Sanitize error messages for terminal #221

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions ldk-server-cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ async fn main() {
);
},
Commands::OnchainSend { address, amount, send_all, fee_rate_sat_per_vb } => {
let amount_sats = amount.map(|a| a.to_sat().unwrap_or_else(|e| handle_error_msg(&e)));
let amount_sats = amount.map(|a| a.to_sat().unwrap_or_else(|e| handle_error_msg(e)));
handle_response_result::<_, OnchainSendResponse>(
client
.onchain_send(OnchainSendRequest {
Expand Down Expand Up @@ -904,7 +904,7 @@ async fn main() {
cltv_expiry_delta,
} => {
let channel_amount_sats =
channel_amount.to_sat().unwrap_or_else(|e| handle_error_msg(&e));
channel_amount.to_sat().unwrap_or_else(|e| handle_error_msg(e));
let push_to_counterparty_msat = push_to_counterparty.map(|a| a.to_msat());
let channel_config = build_open_channel_config(
forwarding_fee_proportional_millionths,
Expand Down Expand Up @@ -933,8 +933,7 @@ async fn main() {
);
},
Commands::SpliceIn { user_channel_id, counterparty_node_id, splice_amount } => {
let splice_amount_sats =
splice_amount.to_sat().unwrap_or_else(|e| handle_error_msg(&e));
let splice_amount_sats = splice_amount.to_sat().unwrap_or_else(|e| handle_error_msg(e));
handle_response_result::<_, SpliceInResponse>(
client
.splice_in(SpliceInRequest {
Expand All @@ -946,8 +945,7 @@ async fn main() {
);
},
Commands::SpliceOut { user_channel_id, counterparty_node_id, address, splice_amount } => {
let splice_amount_sats =
splice_amount.to_sat().unwrap_or_else(|e| handle_error_msg(&e));
let splice_amount_sats = splice_amount.to_sat().unwrap_or_else(|e| handle_error_msg(e));
handle_response_result::<_, SpliceOutResponse>(
client
.splice_out(SpliceOutRequest {
Expand Down Expand Up @@ -1251,8 +1249,8 @@ fn parse_page_token(token_str: &str) -> Result<PageToken, LdkServerError> {
Ok(PageToken { token: parts[0].to_string(), index })
}

fn handle_error_msg(msg: &str) -> ! {
eprintln!("Error: {msg}");
fn handle_error_msg(msg: String) -> ! {
eprintln!("Error: {}", sanitize_for_terminal(msg));
std::process::exit(1);
}

Expand Down