Skip to content

Commit

Permalink
Merge pull request #131 from tnull/2024-02-align-rustfmt
Browse files Browse the repository at this point in the history 
Align `rustfmt.toml` with `rust-lightning`
  • Loading branch information
@TheBlueMatt
TheBlueMatt authored Apr 25, 2024
2 parents 16bc6f4 + c7302c4 commit e6dd91c
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 83 deletions.
13 changes: 10 additions & 3 deletions rustfmt.toml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
hard_tabs = true # use tab characters for indentation, spaces for alignment
use_small_heuristics = "Max"
fn_params_layout = "Compressed"
hard_tabs = true
use_field_init_shorthand = true
max_width = 100
use_small_heuristics = "Max"
fn_args_layout = "Compressed"
match_block_trailing_comma = true
# UNSTABLE: format_code_in_doc_comments = true
# UNSTABLE: overflow_delimited_expr = true
# UNSTABLE: comment_width = 100
# UNSTABLE: format_macro_matchers = true
# UNSTABLE: format_strings = true
# UNSTABLE: group_imports = "StdExternalCrate"
10 changes: 5 additions & 5 deletions src/args.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> {
Some(Err(_)) => {
ldk_peer_port_set = false;
9735
}
},
None => {
ldk_peer_port_set = false;
9735
}
},
};

let mut arg_idx = match ldk_peer_port_set {
Expand All @@ -49,7 +49,7 @@ pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> {
Some("signet") => Network::Signet,
Some(net) => {
panic!("Unsupported network provided. Options are: `regtest`, `testnet`, and `signet`. Got {}", net);
}
},
None => Network::Testnet,
};

Expand Down Expand Up @@ -78,7 +78,7 @@ pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> {
let mut bytes = [0; 32];
bytes[..s.len()].copy_from_slice(s.as_bytes());
bytes
}
},
None => [0; 32],
};

Expand All @@ -89,7 +89,7 @@ pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> {
Ok(sa) => {
ldk_announced_listen_addr.push(sa);
arg_idx += 1;
}
},
Err(_) => panic!("Failed to parse announced-listen-addr into a socket address"),
},
None => break,
Expand Down
82 changes: 41 additions & 41 deletions src/cli.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ pub(crate) fn poll_for_user_input(
Err(e) => {
println!("{:?}", e.into_inner().unwrap());
continue;
}
},
};

let chan_amt_sat: Result<u64, _> = channel_value_sat.unwrap().parse();
Expand Down Expand Up @@ -136,7 +136,7 @@ pub(crate) fn poll_for_user_input(
_ => {
println!("ERROR: invalid boolean flag format. Valid formats: `--option`, `--option=true` `--option=false`");
continue;
}
},
}
}

Expand All @@ -155,7 +155,7 @@ pub(crate) fn poll_for_user_input(
peer_pubkey_and_ip_addr,
);
}
}
},
"sendpayment" => {
let invoice_str = words.next();
if invoice_str.is_none() {
Expand All @@ -170,7 +170,7 @@ pub(crate) fn poll_for_user_input(
Err(e) => {
println!("ERROR: couldn't parse amount_msat: {}", e);
continue;
}
},
};
}

Expand All @@ -184,7 +184,7 @@ pub(crate) fn poll_for_user_input(
(amt, _) => {
println!("ERROR: Cannot process non-Bitcoin-denominated offer value {:?}", amt);
continue;
}
},
};
if user_provided_amt.is_some() && user_provided_amt != Some(amt_msat) {
println!("Amount didn't match offer of {}msat", amt_msat);
Expand Down Expand Up @@ -244,37 +244,37 @@ pub(crate) fn poll_for_user_input(
),
Err(e) => {
println!("ERROR: invalid invoice: {:?}", e);
}
},
}
}
}
},
"keysend" => {
let dest_pubkey = match words.next() {
Some(dest) => match hex_utils::to_compressed_pubkey(dest) {
Some(pk) => pk,
None => {
println!("ERROR: couldn't parse destination pubkey");
continue;
}
},
},
None => {
println!("ERROR: keysend requires a destination pubkey: `keysend <dest_pubkey> <amt_msat>`");
continue;
}
},
};
let amt_msat_str = match words.next() {
Some(amt) => amt,
None => {
println!("ERROR: keysend requires an amount in millisatoshis: `keysend <dest_pubkey> <amt_msat>`");
continue;
}
},
};
let amt_msat: u64 = match amt_msat_str.parse() {
Ok(amt) => amt,
Err(e) => {
println!("ERROR: couldn't parse amount_msat: {}", e);
continue;
}
},
};
keysend(
&channel_manager,
Expand All @@ -284,7 +284,7 @@ pub(crate) fn poll_for_user_input(
&mut outbound_payments.lock().unwrap(),
Arc::clone(&fs_store),
);
}
},
"getoffer" => {
let offer_builder = channel_manager.create_offer_builder(String::new());
if let Err(e) = offer_builder {
Expand Down Expand Up @@ -312,7 +312,7 @@ pub(crate) fn poll_for_user_input(
// correspond with individual payments.
println!("{}", offer.unwrap());
}
}
},
"getinvoice" => {
let amt_str = words.next();
if amt_str.is_none() {
Expand Down Expand Up @@ -351,7 +351,7 @@ pub(crate) fn poll_for_user_input(
fs_store
.write("", "", INBOUND_PAYMENTS_FNAME, &inbound_payments.encode())
.unwrap();
}
},
"connectpeer" => {
let peer_pubkey_and_ip_addr = words.next();
if peer_pubkey_and_ip_addr.is_none() {
Expand All @@ -364,7 +364,7 @@ pub(crate) fn poll_for_user_input(
Err(e) => {
println!("{:?}", e.into_inner().unwrap());
continue;
}
},
};
if tokio::runtime::Handle::current()
.block_on(connect_peer_if_necessary(
Expand All @@ -376,7 +376,7 @@ pub(crate) fn poll_for_user_input(
{
println!("SUCCESS: connected to peer {}", pubkey);
}
}
},
"disconnectpeer" => {
let peer_pubkey = words.next();
if peer_pubkey.is_none() {
Expand All @@ -390,7 +390,7 @@ pub(crate) fn poll_for_user_input(
Err(e) => {
println!("ERROR: {}", e.to_string());
continue;
}
},
};

if do_disconnect_peer(
Expand All @@ -402,7 +402,7 @@ pub(crate) fn poll_for_user_input(
{
println!("SUCCESS: disconnected from peer {}", peer_pubkey);
}
}
},
"listchannels" => list_channels(&channel_manager, &network_graph),
"listpayments" => list_payments(
&inbound_payments.lock().unwrap(),
Expand Down Expand Up @@ -432,18 +432,18 @@ pub(crate) fn poll_for_user_input(
None => {
println!("ERROR: couldn't parse peer_pubkey");
continue;
}
},
};
let peer_pubkey = match PublicKey::from_slice(&peer_pubkey_vec) {
Ok(peer_pubkey) => peer_pubkey,
Err(_) => {
println!("ERROR: couldn't parse peer_pubkey");
continue;
}
},
};

close_channel(channel_id, peer_pubkey, channel_manager.clone());
}
},
"forceclosechannel" => {
let channel_id_str = words.next();
if channel_id_str.is_none() {
Expand All @@ -468,18 +468,18 @@ pub(crate) fn poll_for_user_input(
None => {
println!("ERROR: couldn't parse peer_pubkey");
continue;
}
},
};
let peer_pubkey = match PublicKey::from_slice(&peer_pubkey_vec) {
Ok(peer_pubkey) => peer_pubkey,
Err(_) => {
println!("ERROR: couldn't parse peer_pubkey");
continue;
}
},
};

force_close_channel(channel_id, peer_pubkey, channel_manager.clone());
}
},
"nodeinfo" => node_info(&channel_manager, &peer_manager),
"listpeers" => list_peers(peer_manager.clone()),
"signmessage" => {
Expand All @@ -495,7 +495,7 @@ pub(crate) fn poll_for_user_input(
&keys_manager.get_node_secret_key()
)
);
}
},
"sendonionmessage" => {
let path_pks_str = words.next();
if path_pks_str.is_none() {
Expand All @@ -513,15 +513,15 @@ pub(crate) fn poll_for_user_input(
println!("ERROR: couldn't parse peer_pubkey");
errored = true;
break;
}
},
};
let node_pubkey = match PublicKey::from_slice(&node_pubkey_vec) {
Ok(peer_pubkey) => peer_pubkey,
Err(_) => {
println!("ERROR: couldn't parse peer_pubkey");
errored = true;
break;
}
},
};
intermediate_nodes.push(node_pubkey);
}
Expand All @@ -533,14 +533,14 @@ pub(crate) fn poll_for_user_input(
_ => {
println!("Need an integral message type above 64");
continue;
}
},
};
let data = match words.next().map(|s| hex_utils::to_vec(s)) {
Some(Some(data)) => data,
_ => {
println!("Need a hex data string");
continue;
}
},
};
let destination = Destination::Node(intermediate_nodes.pop().unwrap());
match onion_messenger.send_onion_message(
Expand All @@ -550,10 +550,10 @@ pub(crate) fn poll_for_user_input(
) {
Ok(success) => {
println!("SUCCESS: forwarded onion message to first hop {:?}", success)
}
},
Err(e) => println!("ERROR: failed to send onion message: {:?}", e),
}
}
},
"quit" | "exit" => break,
_ => println!("Unknown command. See `\"help\" for available commands."),
}
Expand Down Expand Up @@ -729,7 +729,7 @@ pub(crate) async fn do_connect_peer(
return Ok(());
}
}
}
},
None => Err(()),
}
}
Expand Down Expand Up @@ -779,11 +779,11 @@ fn open_channel(
Ok(_) => {
println!("EVENT: initiated channel with peer {}. ", peer_pubkey);
return Ok(());
}
},
Err(e) => {
println!("ERROR: failed to open channel: {:?}", e);
return Err(());
}
},
}
}

Expand Down Expand Up @@ -821,7 +821,7 @@ fn send_payment(
println!("Failed to parse invoice: {:?}", e);
print!("> ");
return;
}
},
};
outbound_payments.payments.insert(
payment_id,
Expand All @@ -846,13 +846,13 @@ fn send_payment(
let amt_msat = invoice.amount_milli_satoshis().unwrap();
println!("EVENT: initiated sending {} msats to {}", amt_msat, payee_pubkey);
print!("> ");
}
},
Err(e) => {
println!("ERROR: failed to send payment: {:?}", e);
print!("> ");
outbound_payments.payments.get_mut(&payment_id).unwrap().status = HTLCStatus::Failed;
fs_store.write("", "", OUTBOUND_PAYMENTS_FNAME, &outbound_payments.encode()).unwrap();
}
},
};
}

Expand Down Expand Up @@ -887,13 +887,13 @@ fn keysend<E: EntropySource>(
Ok(_payment_hash) => {
println!("EVENT: initiated sending {} msats to {}", amt_msat, payee_pubkey);
print!("> ");
}
},
Err(e) => {
println!("ERROR: failed to send payment: {:?}", e);
print!("> ");
outbound_payments.payments.get_mut(&payment_id).unwrap().status = HTLCStatus::Failed;
fs_store.write("", "", OUTBOUND_PAYMENTS_FNAME, &outbound_payments.encode()).unwrap();
}
},
};
}

Expand Down Expand Up @@ -921,11 +921,11 @@ fn get_invoice(
Ok(inv) => {
println!("SUCCESS: generated invoice: {}", inv);
inv
}
},
Err(e) => {
println!("ERROR: failed to create invoice: {:?}", e);
return;
}
},
};

let payment_hash = PaymentHash(invoice.payment_hash().to_byte_array());
Expand Down
Loading

0 comments on commit e6dd91c

Please sign in to comment.