qq

Author: ImplOfAnImpl

Cargo.toml

@@ -335,12 +335,6 @@ overflow-checks = true
 [profile.test.package.script]
 opt-level = 2
 
-[features]
-tokio-console = []
-trezor = []
-ledger = []
-default = ["trezor", "ledger"]
-
 [patch.crates-io]
 # Using fontconfig-parser v0.5.8 completely breaks UI in node-gui on Linux - most of the text disappears and the few
 # characters that remain have broken spacing, so we force the usage of v0.5.7 via "patch".

node-gui/Cargo.toml

@@ -51,4 +51,4 @@ ledger = [
   "wallet-cli-commands/ledger",
   "node-gui-backend/ledger",
 ]
-default = ["trezor", "ledger"]
+default = ["trezor"]

node-gui/backend/Cargo.toml

@@ -58,4 +58,4 @@ ledger = [
   "wallet-rpc-client/ledger",
   "wallet-cli-commands/ledger",
 ]
-default = ["trezor", "ledger"]
+default = ["trezor"]

node-gui/src/main_window/main_widget/tabs/wallet/mod.rs

@@ -472,7 +472,9 @@ impl Tab for WalletTab {
         let text = match node_state.wallets.get(&self.wallet_id) {
             Some(wallet_info) => match wallet_info.extra_info {
                 wallet_controller::types::WalletExtraInfo::SoftwareWallet => "Software wallet",
+                #[cfg(feature = "trezor")]
                 wallet_controller::types::WalletExtraInfo::TrezorWallet { .. } => "Trezor wallet",
+                #[cfg(feature = "ledger")]
                 wallet_controller::types::WalletExtraInfo::LedgerWallet { .. } => "Ledger wallet",
             },
             None => "No wallet",

node-gui/src/main_window/main_widget/tabs/wallet/status_bar.rs

@@ -14,10 +14,10 @@
 // limitations under the License.
 
 #[cfg(any(feature = "trezor", feature = "ledger"))]
-use iced::widget::{rich_text, span};
+use iced::widget::{rich_text, row, span};
 use iced::{
     font,
-    widget::{container, row, Container},
+    widget::{container, Container, Row},
     Alignment, Element, Font, Length, Padding, Theme,
 };
 
@@ -31,13 +31,17 @@ const HORIZONTAL_PADDING: f32 = 10.;
 
 #[allow(clippy::float_arithmetic)]
 pub fn estimate_status_bar_height(wallet_info: &WalletExtraInfo) -> f32 {
+    #[cfg(any(feature = "trezor", feature = "ledger"))]
+    let height_for_hw_wallet = TEXT_SIZE + 2. * VERTICAL_PADDING
+            // For some reason, the status bar gets a bit of additional height.
+            + 4.;
+
     match wallet_info {
         WalletExtraInfo::SoftwareWallet => 0.,
-        WalletExtraInfo::TrezorWallet { .. } | WalletExtraInfo::LedgerWallet { .. } => {
-            TEXT_SIZE + 2. * VERTICAL_PADDING
-            // For some reason, the status bar gets a bit of additional height.
-            + 4.
-        }
+        #[cfg(feature = "trezor")]
+        WalletExtraInfo::TrezorWallet { .. } => height_for_hw_wallet,
+        #[cfg(feature = "ledger")]
+        WalletExtraInfo::LedgerWallet { .. } => height_for_hw_wallet,
     }
 }
 
@@ -47,7 +51,7 @@ pub fn view_status_bar(wallet_info: &WalletExtraInfo) -> Option<Element<'static,
         ..Font::default()
     };
 
-    let row = match wallet_info {
+    let row: Row<'_, WalletMessage> = match wallet_info {
         WalletExtraInfo::SoftwareWallet => {
             return None;
         }

utils/Cargo.toml

@@ -40,7 +40,7 @@ tempfile.workspace = true
 loom.workspace = true
 
 [features]
-tokio-console = []
+tokio-console = ["logging/tokio-console"]
 
 [[bench]]
 name = "benches"

wallet/Cargo.toml

@@ -87,4 +87,4 @@ ledger = [
   "dep:mintlayer-ledger-messages",
   "wallet-types/ledger",
 ]
-default = ["trezor", "ledger"]
+default = ["trezor"]

wallet/storage/Cargo.toml

@@ -27,4 +27,4 @@ rstest.workspace = true
 [features]
 trezor = ["wallet-types/trezor"]
 ledger = ["wallet-types/ledger"]
-default = ["trezor", "ledger"]
+default = ["trezor"]

wallet/types/Cargo.toml

@@ -38,4 +38,4 @@ rstest.workspace = true
 [features]
 trezor = []
 ledger = []
-default = ["trezor", "ledger"]
+default = ["trezor"]

wallet/types/src/hw_data.rs

@@ -13,8 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use core::fmt;
-
 use serialization::{Decode, Encode};
 
 /// This is the data that will be stored in the wallet db.
@@ -56,8 +54,9 @@ pub enum LedgerModel {
     Unknown { usb_pid: Option<u16> },
 }
 
-impl fmt::Display for LedgerModel {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+#[cfg(feature = "ledger")]
+impl std::fmt::Display for LedgerModel {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             LedgerModel::NanoS => write!(f, "Nano S"),
             LedgerModel::NanoSPlus => write!(f, "Nano S Plus"),