Clean up argument parsing. #5
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Let's merge each change as a separate commit. Let's use the rustfmt.toml rules from the long discussion about fmt rules in rust-bitcoin to stay consistent with that community |
DanGould
requested changes
Aug 12, 2022
src/main.rs
Outdated
Comment on lines
293
to
318
| // the remaining argument is the wallet amount (if any) | ||
| let mut wallet_amount = None; | ||
|
|
||
| // parse scheduled channel arguments: pairs of (addr, amount) | ||
| let channels = match args.get(1..) { | ||
| Some(args) => args | ||
| .chunks(2) | ||
| .filter_map(|chunk| match chunk.len() { | ||
| // parse scheduled channel arg: a pair of (addr, amount) | ||
| 2 => Some(ScheduledChannel::from_args(&chunk[0], &chunk[1])), // p2p_address, btc_amount | ||
| // parse wallet amount (optional) | ||
| 1 => { | ||
| wallet_amount = Some( | ||
| bitcoin::Amount::from_str_in( | ||
| chunk[0].as_str(), | ||
| bitcoin::Denomination::Satoshi, | ||
| ) | ||
| .map_err(ArgError::InvalidWalletAmount), | ||
| ); | ||
| None | ||
| } | ||
| unexpected_len => panic!("chunk len should only be 1 or 2, got {}", unexpected_len), | ||
| }) | ||
| .collect::<Result<VecDeque<_>, _>>()?, | ||
| None => return Ok(None), | ||
| }; |
There was a problem hiding this comment.
I like the comments that explain what is going on. However I think we should keep the, the original loop + match with args.next(). There's way less nesting and fewer lines. Can we merge the best of both and keep the comments but use the original logic?
There was a problem hiding this comment.
@DanGould I tried again, this is my new solution. Let me know what you think.
// parse scheduled channel arguments: pairs of (addr, amount)
let mut channels = VecDeque::with_capacity(args.len() / 2);
// the remaining single argument is the wallet amount in satoshis (if any)
let wallet_amount = loop {
match (args.next(), args.next()) {
// we have a pair of arguments, interpret it as a scheduled channel (p2p addr, amount)
(Some(addr), Some(amount)) => {
channels.push_back(ScheduledChannel::from_args(addr, amount)?);
}
// if there is a remaining single argument, it is the wallet amount
(Some(amount), None) => {
break bitcoin::Amount::from_str_in(amount, bitcoin::Denomination::Satoshi)
.map_err(ArgError::InvalidWalletAmount)?
}
// if there is no remaining single argument, the wallet amount is 0
_ => break bitcoin::Amount::ZERO,
}
};
evanlinjin
force-pushed
the
fix_arg_parsing
branch
from
557e800
to
3616c11
Compare
evanlinjin
force-pushed
the
fix_arg_parsing
branch
from
9efdee7
to
a0120d7
Compare
DanGould
approved these changes
Aug 13, 2022
| use bitcoin::util::address::Address; | ||
| use bitcoin::util::psbt::PartiallySignedTransaction; | ||
| use bitcoin::{Script, TxOut}; | ||
| use hyper::service::{make_service_fn, service_fn}; | ||
| use hyper::{Body, Method, Request, Response, Server, StatusCode}; | ||
| use ln_types::P2PAddress; | ||
| use std::collections::HashMap; | ||
| use std::collections::{HashMap}; |
There was a problem hiding this comment.
rustfmt commit can fix this non-change
evanlinjin
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cleans up argument parsing and
cargo fmtsetup.