Merge pull request #230 from dusk-network/update-requestty

Update nightly and requestty

CHANGELOG.md

@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Change `dusk-wallet-core` to `0.24.0-plonk.0.16-rc.2`
 - Change `DEFAULT_MAX_ADDRESSES` from 255 to 25
+- Update `requestty` from `0.4.1` to `0.5.0` [#231]
 
 ## [0.20.1] - 2023-11-22
 
@@ -471,6 +472,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Implementation of `Store` trait from `wallet-core`
 - Implementation of `State` and `Prover` traits from `wallet-core`
 
+[#231]: https://github.com/dusk-network/wallet-cli/issues/231
 [#226]: https://github.com/dusk-network/wallet-cli/issues/226
 [#222]: https://github.com/dusk-network/wallet-cli/issues/222
 [#218]: https://github.com/dusk-network/wallet-cli/issues/218

Cargo.toml

@@ -28,7 +28,7 @@ hex = "0.4"
 tiny-bip39 = "0.8"
 crossterm = "0.23"
 rand_core = "0.6"
-requestty = "0.4.1"
+requestty = "0.5.0"
 futures = "0.3"
 base64 = "0.13"
 crypto = "0.3"

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2023-05-22"
+channel = "nightly-2024-02-18"
 components = ["rustfmt", "cargo", "clippy"]

src/bin/command/history.rs

@@ -68,8 +68,7 @@ pub(crate) async fn transaction_from_notes(
 ) -> anyhow::Result<Vec<TransactionHistory>> {
     notes.sort_by(|a, b| a.note.pos().cmp(b.note.pos()));
     let mut ret: Vec<TransactionHistory> = vec![];
-    let gql =
-        GraphQL::new(&settings.state.to_string(), io::status::interactive);
+    let gql = GraphQL::new(settings.state.to_string(), io::status::interactive);
 
     let nullifiers = notes
         .iter()

src/bin/interactive.rs

@@ -330,7 +330,7 @@ pub(crate) fn load_wallet(
                 }) {
                     Ok(wallet) => break wallet,
                     Err(_) if attempt > 2 => {
-                        return Err(Error::AttemptsExhausted)?;
+                        Err(Error::AttemptsExhausted)?;
                     }
                     Err(_) => {
                         println!("Invalid password, please try again");

src/bin/main.rs

@@ -160,12 +160,9 @@ async fn exec() -> anyhow::Result<()> {
 
     let password = &settings.password;
 
-    match cmd {
-        Some(ref cmd) if cmd == &Command::Settings => {
-            println!("{}", &settings);
-            return Ok(());
-        }
-        _ => {}
+    if let Some(Command::Settings) = cmd {
+        println!("{}", &settings);
+        return Ok(());
     };
 
     let file_version = dat::read_file_version(&wallet_path);

src/crypto.rs

@@ -23,7 +23,7 @@ pub(crate) fn encrypt(plaintext: &[u8], pwd: &[u8]) -> Result<Vec<u8>, Error> {
     let cipher = Aes256Cbc::new_from_slices(pwd, &iv)?;
     let enc = cipher.encrypt_vec(plaintext);
 
-    let ciphertext = iv.into_iter().chain(enc.into_iter()).collect();
+    let ciphertext = iv.into_iter().chain(enc).collect();
     Ok(ciphertext)
 }
 

src/currency.rs

@@ -131,7 +131,7 @@ impl Ord for Dusk {
 
 impl PartialOrd for Dusk {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.0.partial_cmp(&other.0)
+        Some(self.cmp(other))
     }
 }
 impl PartialOrd<Lux> for Dusk {