diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b7e9e9f..2e83b210 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,7 +58,11 @@ jobs: - name: rustfmt run: cd gui && cargo fmt -- --check - name: clippy - run: cargo clippy --all-features --all-targets -- -D warnings + run: | + sudo apt-get update & + sudo apt-get install --allow-downgrades libudev1=245.4-4ubuntu3 libudev-dev=245.4-4ubuntu3 pkg-config libxkbcommon-dev libvulkan-dev && + cd gui && + cargo clippy --all-features --all-targets -- -D warnings unit_tests_gui: needs: linter_gui @@ -89,4 +93,8 @@ jobs: run: cd gui && cargo test --verbose --color always -- --nocapture - name: Test on Rust ${{ matrix.toolchain }} (non Windows) if: matrix.os == 'ubuntu-latest' - run: sudo apt-get update & sudo apt-get install --allow-downgrades libudev1=245.4-4ubuntu3 libudev-dev=245.4-4ubuntu3 pkg-config libxkbcommon-dev libvulkan-dev && cd gui && cargo test --verbose --color always -- --nocapture + run: | + sudo apt-get update & + sudo apt-get install --allow-downgrades libudev1=245.4-4ubuntu3 libudev-dev=245.4-4ubuntu3 pkg-config libxkbcommon-dev libvulkan-dev && + cd gui && + cargo test --verbose --color always -- --nocapture diff --git a/gui/src/installer/step/descriptor.rs b/gui/src/installer/step/descriptor.rs index 1e56da76..b5a77bc9 100644 --- a/gui/src/installer/step/descriptor.rs +++ b/gui/src/installer/step/descriptor.rs @@ -121,7 +121,7 @@ impl Step for DefineDescriptor { self.user_xpub.valid = key.is_ok(); // Check the Network if let Ok(key) = &key { - self.user_xpub.valid = check_key_network(&key, ctx.bitcoin_config.network); + self.user_xpub.valid = check_key_network(key, ctx.bitcoin_config.network); } } @@ -130,7 +130,7 @@ impl Step for DefineDescriptor { self.heir_xpub.valid = key.is_ok(); // Check the Network if let Ok(key) = &key { - self.heir_xpub.valid = check_key_network(&key, ctx.bitcoin_config.network); + self.heir_xpub.valid = check_key_network(key, ctx.bitcoin_config.network); } } @@ -158,13 +158,13 @@ impl Step for DefineDescriptor { let user_key = DescriptorPublicKey::from_str(&self.user_xpub.value); self.user_xpub.valid = user_key.is_ok(); if let Ok(key) = &user_key { - self.user_xpub.valid = check_key_network(&key, ctx.bitcoin_config.network); + self.user_xpub.valid = check_key_network(key, ctx.bitcoin_config.network); } let heir_key = DescriptorPublicKey::from_str(&self.heir_xpub.value); self.heir_xpub.valid = heir_key.is_ok(); if let Ok(key) = &heir_key { - self.heir_xpub.valid = check_key_network(&key, ctx.bitcoin_config.network); + self.heir_xpub.valid = check_key_network(key, ctx.bitcoin_config.network); } let sequence = self.sequence.value.parse::();