nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gui: fix clippy errors

Browse Source
This commit is contained in:
edouard 2022-11-15 18:11:42 +01:00
parent 4489b05dda
commit 635903118e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/main.yml vendored
View File

@ -59,10 +59,10 @@ jobs:
run: cd gui && cargo fmt -- --check
- name: clippy
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
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
@ -94,7 +94,7 @@ jobs:
- 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
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

8
gui/src/installer/step/descriptor.rs
View File

@ -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::<u16>();