Less cloning and additional pattern simplifications #326
Conversation
| @@ -1344,7 +1344,7 @@ where | |||
|
|
|||
| fn get_stored_tx(&self, tx: &TxLogEntry) -> Result<Option<TransactionV3>, ErrorKind> { | |||
| Owner::get_stored_tx(self, None, tx) | |||
| .map(|x| x.map(|y| TransactionV3::from(y))) | |||
| /// let valid = api_owner.verify_payment_proof(None, &p); | ||
| /// if let Ok(_) = valid { | ||
| /// //... | ||
| /// } |
There was a problem hiding this comment.
What are you running on it to tidy up doc comment formatting? Rustfmt doesn't get it
There was a problem hiding this comment.
Did it manually...
| shared_pubkey | ||
| .mul_assign(&secp, &sec_key) | ||
| .map_err(|e| ErrorKind::Secp(e))?; | ||
| .map_err(ErrorKind::Secp)?; |
There was a problem hiding this comment.
Does this not lose the actual contents of the error?
There was a problem hiding this comment.
Ah, wait, no it doesn't, never mind.
| { | ||
| let mut s = self.shared_key.lock(); | ||
| *s = Some(shared_key); | ||
| } | ||
|
|
||
| let pub_key = | ||
| PublicKey::from_secret_key(&secp, &sec_key).map_err(|e| ErrorKind::Secp(e))?; | ||
| let pub_key = PublicKey::from_secret_key(&secp, &sec_key).map_err(ErrorKind::Secp)?; |
| @@ -107,7 +106,7 @@ impl HttpSlateSender { | |||
|
|
|||
| // trivial tests for now, but will be expanded later | |||
| if foreign_api_version < 2 { | |||
| let report = format!("Other wallet reports unrecognized API format."); | |||
| let report = "Other wallet reports unrecognized API format.".to_string(); | |||
There was a problem hiding this comment.
Some of this is 6 of one, half a dozen of the other kind of stuff. to_string is probably marginally more efficient.
| @@ -203,7 +202,7 @@ impl WalletSeed { | |||
| Run \"grin-wallet init\" to initialize a new wallet.", | |||
| seed_file_path | |||
| ); | |||
| Err(ErrorKind::WalletSeedDoesntExist)? | |||
| Err(ErrorKind::WalletSeedDoesntExist.into()) | |||
There was a problem hiding this comment.
Why does this thing hate the ? operator so much?
There was a problem hiding this comment.
^^ it’s just more straightforward to return directly the error.
|
There's a lot to go over here on one go, most of it is fair enough, some of it looks like someone imposing their very opinionated personal beliefs on how some things should be done, but there's likely some justification behind them that I'm not interested in bikeshedding about. |
|
Hehe, most of it makes sense though. And I left the match on boolean untouched 😛 |
* API cleanup * Config cleanup * Impl cleanup * Libwallet cleanup * Additionnal simplification
Similar to mimblewimble/grin#3223.
Shouldn't change any logic.