Run cargo fmt on the firmware

afilini · May 24, 2024 · 1a8feb8 · 1a8feb8
1 parent eca386f
commit 1a8feb8
Show file tree

Hide file tree

Showing 15 changed files with 81 additions and 72 deletions.
diff --git a/firmware/build.rs b/firmware/build.rs
@@ -1,17 +1,17 @@
 // Portal Hardware Wallet firmware and supporting software libraries
-// 
+//
 // Copyright (C) 2024 Alekos Filini
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
@@ -21,4 +21,4 @@ fn main() {
     } else if cfg!(feature = "device") {
         println!("cargo:rustc-link-arg=-L./linker-scripts/device");
     }
-}
+}
diff --git a/firmware/src/config.rs b/firmware/src/config.rs
@@ -1,17 +1,17 @@
 // Portal Hardware Wallet firmware and supporting software libraries
-// 
+//
 // Copyright (C) 2024 Alekos Filini
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 

diff --git a/firmware/src/emulator/config.rs b/firmware/src/emulator/config.rs
@@ -1,17 +1,17 @@
 // Portal Hardware Wallet firmware and supporting software libraries
-// 
+//
 // Copyright (C) 2024 Alekos Filini
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 

diff --git a/firmware/src/emulator/hw.rs b/firmware/src/emulator/hw.rs
@@ -1,17 +1,17 @@
 // Portal Hardware Wallet firmware and supporting software libraries
-// 
+//
 // Copyright (C) 2024 Alekos Filini
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 

diff --git a/firmware/src/emulator/mod.rs b/firmware/src/emulator/mod.rs
@@ -1,17 +1,17 @@
 // Portal Hardware Wallet firmware and supporting software libraries
-// 
+//
 // Copyright (C) 2024 Alekos Filini
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 

diff --git a/firmware/src/error.rs b/firmware/src/error.rs
@@ -1,17 +1,17 @@
 // Portal Hardware Wallet firmware and supporting software libraries
-// 
+//
 // Copyright (C) 2024 Alekos Filini
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 

diff --git a/firmware/src/handlers/bitcoin.rs b/firmware/src/handlers/bitcoin.rs
@@ -1,17 +1,17 @@
 // Portal Hardware Wallet firmware and supporting software libraries
-// 
+//
 // Copyright (C) 2024 Alekos Filini
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
@@ -33,8 +33,8 @@ use bdk::miniscript::{DescriptorPublicKey, ForEachKey};
 use bdk::HdKeyPaths;
 
 use gui::{
-    ShowScrollingAddressPage, GenericTwoLinePage, LoadingPage, Page, SigningTxPage,
-    SummaryPage, TxOutputPage, TxSummaryPage,
+    GenericTwoLinePage, LoadingPage, Page, ShowScrollingAddressPage, SigningTxPage, SummaryPage,
+    TxOutputPage, TxSummaryPage,
 };
 use model::{
     DescriptorVariant, ExtendedKey, MultisigKey, ScriptType, SerializedDerivationPath,
@@ -561,7 +561,12 @@ pub async fn handle_set_descriptor_request(
 
     let mut page = GenericTwoLinePage::new(
         "Address type",
-        new_wallet.config.secret.descriptor.script_type.display_name(),
+        new_wallet
+            .config
+            .secret
+            .descriptor
+            .script_type
+            .display_name(),
         "HOLD BTN FOR NEXT PAGE",
         50,
     );
@@ -641,7 +646,11 @@ pub async fn handle_set_descriptor_request(
 
     log::debug!("First address: {}", first_address);
     let address_str = first_address.to_string();
-    let mut page = ShowScrollingAddressPage::new(&address_str, "Confirm first address", "HOLD BTN FOR NEXT PAGE");
+    let mut page = ShowScrollingAddressPage::new(
+        &address_str,
+        "Confirm first address",
+        "HOLD BTN FOR NEXT PAGE",
+    );
     page.init_display(&mut peripherals.display)?;
     page.draw_to(&mut peripherals.display)?;
     peripherals.display.flush()?;

diff --git a/firmware/src/handlers/fwupdate.rs b/firmware/src/handlers/fwupdate.rs
@@ -1,17 +1,17 @@
 // Portal Hardware Wallet firmware and supporting software libraries
-// 
+//
 // Copyright (C) 2024 Alekos Filini
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 

diff --git a/firmware/src/handlers/idle.rs b/firmware/src/handlers/idle.rs
@@ -1,17 +1,17 @@
 // Portal Hardware Wallet firmware and supporting software libraries
-// 
+//
 // Copyright (C) 2024 Alekos Filini
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
@@ -47,7 +47,7 @@ pub async fn handle_idle(
                     .nfc
                     .send(Reply::Info(DeviceInfo::new_unlocked_initialized(
                         wallet.network(),
-                        env!("CARGO_PKG_VERSION")
+                        env!("CARGO_PKG_VERSION"),
                     )))
                     .await
                     .unwrap();

diff --git a/firmware/src/handlers/init.rs b/firmware/src/handlers/init.rs
@@ -1,17 +1,17 @@
 // Portal Hardware Wallet firmware and supporting software libraries
-// 
+//
 // Copyright (C) 2024 Alekos Filini
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
@@ -36,9 +36,7 @@ use bdk::keys::{
     DescriptorKey, DescriptorPublicKey, DescriptorSecretKey, ScriptContext, ValidNetworks,
 };
 
-use gui::{
-    GeneratingMnemonicPage, LoadingPage, MnemonicPage, Page, WelcomePage,
-};
+use gui::{GeneratingMnemonicPage, LoadingPage, MnemonicPage, Page, WelcomePage};
 use model::{Config, DeviceInfo};
 
 use super::*;
@@ -308,7 +306,9 @@ pub async fn handle_init(
             Some(model::Request::GetInfo) => {
                 peripherals
                     .nfc
-                    .send(model::Reply::Info(DeviceInfo::new_locked_uninitialized(env!("CARGO_PKG_VERSION"))))
+                    .send(model::Reply::Info(DeviceInfo::new_locked_uninitialized(
+                        env!("CARGO_PKG_VERSION"),
+                    )))
                     .await
                     .unwrap();
                 peripherals.nfc_finished.recv().await.unwrap();
@@ -374,7 +374,7 @@ pub async fn handle_locked(
                     .nfc
                     .send(model::Reply::Info(DeviceInfo::new_locked_initialized(
                         config.network,
-                        env!("CARGO_PKG_VERSION")
+                        env!("CARGO_PKG_VERSION"),
                     )))
                     .await
                     .unwrap();
@@ -569,7 +569,7 @@ pub async fn handle_unverified_config(
                         .send(model::Reply::Info(DeviceInfo::new_unverified_config(
                             config.network,
                             config.pair_code.is_some(),
-                            env!("CARGO_PKG_VERSION")
+                            env!("CARGO_PKG_VERSION"),
                         )))
                         .await
                         .unwrap();

diff --git a/firmware/src/handlers/mod.rs b/firmware/src/handlers/mod.rs
@@ -1,17 +1,17 @@
 // Portal Hardware Wallet firmware and supporting software libraries
-// 
+//
 // Copyright (C) 2024 Alekos Filini
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 

diff --git a/firmware/src/hw/mod.rs b/firmware/src/hw/mod.rs
@@ -1,17 +1,17 @@
 // Portal Hardware Wallet firmware and supporting software libraries
-// 
+//
 // Copyright (C) 2024 Alekos Filini
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 

diff --git a/firmware/src/hw/tsc.rs b/firmware/src/hw/tsc.rs
@@ -1,17 +1,17 @@
 // Portal Hardware Wallet firmware and supporting software libraries
-// 
+//
 // Copyright (C) 2024 Alekos Filini
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.