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

Clippification

Browse Source 
Bump clippy in CI to latest stable.
This commit is contained in:
Antoine Poinsot 2024-01-04 14:40:15 +01:00
parent 4949632fe6
commit 0e99136404
No known key found for this signature in database
GPG Key ID: E13FC145CD3F4304
5 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.70.0
toolchain: 1.75.0
components: rustfmt, clippy
override: true
- name: rustfmt

3
src/commands/mod.rs
View File

@ -24,7 +24,6 @@ use utils::{
use std::{
collections::{hash_map, HashMap, HashSet},
convert::TryInto,
fmt, sync,
};
@ -961,7 +960,7 @@ impl DaemonControl {
let current_height = self.bitcoin.chain_tip().height;
let timelock =
timelock.unwrap_or_else(|| self.config.main_descriptor.first_timelock_value());
let height_delta: i32 = timelock.try_into().expect("Must fit, it's a u16");
let height_delta: i32 = timelock.into();
let sweepable_coins: Vec<_> = db_conn
.coins(&[CoinStatus::Confirmed], &[])
.into_values()

30
src/database/sqlite/mod.rs
View File

@ -973,7 +973,7 @@ CREATE TABLE spend_transactions (
};
conn.new_unspent_coins(&[coin_a]);
// We can query by status and/or outpoint.
assert!(vec![
assert!([
conn.coins(&[], &[]),
conn.coins(&[CoinStatus::Unconfirmed], &[]),
conn.coins(&[CoinStatus::Unconfirmed], &[outpoint_a]),
@ -1022,7 +1022,7 @@ CREATE TABLE spend_transactions (
};
conn.new_unspent_coins(&[coin_b]);
// Both coins are unconfirmed.
assert!(vec![
assert!([
conn.coins(&[], &[]),
conn.coins(&[CoinStatus::Unconfirmed], &[]),
conn.coins(&[CoinStatus::Unconfirmed], &[outpoint_a, outpoint_b]),
@ -1034,7 +1034,7 @@ CREATE TABLE spend_transactions (
&& c[0].outpoint == coin_a.outpoint
&& c[1].outpoint == coin_b.outpoint));
// We can filter for just the first coin.
assert!(vec![
assert!([
conn.coins(&[CoinStatus::Unconfirmed], &[outpoint_a]),
conn.coins(&[], &[outpoint_a]),
conn.db_coins(&[outpoint_a])
@ -1042,7 +1042,7 @@ CREATE TABLE spend_transactions (
.iter()
.all(|res| res.len() == 1 && res[0].outpoint == coin_a.outpoint));
// Or we can filter for just the second coin.
assert!(vec![
assert!([
conn.coins(&[CoinStatus::Unconfirmed], &[outpoint_b]),
conn.coins(&[], &[outpoint_b]),
conn.db_coins(&[outpoint_b])
@ -1062,7 +1062,7 @@ CREATE TABLE spend_transactions (
.is_empty());
// Now if we confirm one, it'll be marked as such.
conn.confirm_coins(&[(coin_a.outpoint, 174500, 174500)]);
assert!(vec![
assert!([
conn.coins(&[CoinStatus::Confirmed], &[]),
conn.coins(&[CoinStatus::Confirmed], &[outpoint_a]),
conn.coins(&[], &[outpoint_a]),
@ -1071,7 +1071,7 @@ CREATE TABLE spend_transactions (
.iter()
.all(|res| res.len() == 1 && res[0].outpoint == coin_a.outpoint));
// We can get both confirmed and unconfirmed.
assert!(vec![
assert!([
conn.coins(&[], &[]),
conn.coins(&[CoinStatus::Unconfirmed, CoinStatus::Confirmed], &[]),
conn.coins(
@ -1091,7 +1091,7 @@ CREATE TABLE spend_transactions (
coin_a.outpoint,
bitcoin::Txid::from_slice(&[0; 32][..]).unwrap(),
)]);
assert!(vec![
assert!([
conn.coins(&[CoinStatus::Spending], &[]),
conn.coins(&[CoinStatus::Spending], &[outpoint_a]),
conn.coins(&[], &[outpoint_a]),
@ -1101,7 +1101,7 @@ CREATE TABLE spend_transactions (
.iter()
.all(|res| res.len() == 1 && res[0].outpoint == coin_a.outpoint));
// The second coin is still unconfirmed.
assert!(vec![
assert!([
conn.coins(&[CoinStatus::Unconfirmed], &[]),
conn.coins(&[CoinStatus::Unconfirmed], &[outpoint_b]),
conn.coins(&[], &[outpoint_b]),
@ -1118,7 +1118,7 @@ CREATE TABLE spend_transactions (
3_000_000,
)]);
// The coin no longer has spending status.
assert!(vec![
assert!([
conn.coins(&[CoinStatus::Spending], &[]),
conn.coins(&[CoinStatus::Spending], &[outpoint_a]),
conn.list_spending_coins(),
@ -1127,7 +1127,7 @@ CREATE TABLE spend_transactions (
.all(|res| res.is_empty()));
// Both coins are still in DB.
assert!(vec![
assert!([
conn.coins(&[], &[]),
conn.coins(&[CoinStatus::Unconfirmed, CoinStatus::Spent], &[]),
conn.coins(
@ -1174,7 +1174,7 @@ CREATE TABLE spend_transactions (
conn.new_unspent_coins(&[coin_c, coin_d]);
// We can get all three unconfirmed coins with different status/outpoint filters.
assert!(vec![
assert!([
conn.coins(&[CoinStatus::Unconfirmed], &[]),
conn.coins(
&[CoinStatus::Unconfirmed],
@ -1190,7 +1190,7 @@ CREATE TABLE spend_transactions (
&& coin[2].outpoint == coin_d.outpoint));
// We can also get two of the three unconfirmed coins by filtering for their outpoints.
assert!(vec![
assert!([
conn.coins(&[CoinStatus::Unconfirmed], &[outpoint_b, outpoint_c]),
conn.coins(&[], &[outpoint_b, outpoint_c]),
conn.db_coins(&[outpoint_b, outpoint_c]),
@ -1206,7 +1206,7 @@ CREATE TABLE spend_transactions (
bitcoin::Txid::from_slice(&[1; 32][..]).unwrap(),
)]);
// The coin shows as spending.
assert!(vec![
assert!([
conn.coins(&[CoinStatus::Spending], &[]),
conn.coins(&[CoinStatus::Spending], &[outpoint_b]),
conn.coins(&[], &[outpoint_b]),
@ -1220,7 +1220,7 @@ CREATE TABLE spend_transactions (
conn.confirm_coins(&[(coin_c.outpoint, 175500, 175500)]);
// We now only have one unconfirmed coin.
assert!(vec![
assert!([
conn.coins(&[CoinStatus::Unconfirmed], &[]),
conn.coins(
&[CoinStatus::Unconfirmed],
@ -1233,7 +1233,7 @@ CREATE TABLE spend_transactions (
.all(|c| c.len() == 1 && c[0].outpoint == coin_d.outpoint));
// There is now one coin for each status.
assert!(vec![
assert!([
conn.coins(&[CoinStatus::Unconfirmed], &[]),
conn.coins(&[CoinStatus::Unconfirmed], &[outpoint_d]),
conn.coins(&[CoinStatus::Confirmed], &[]),

2
src/descriptors/analysis.rs
View File

@ -109,7 +109,7 @@ impl DescKeyChecker {
// without origin entirely.
if let Some(ref origin) = xpub.origin {
let der_paths = xpub.derivation_paths.paths();
let first_der_path = der_paths.get(0).expect("Cannot be empty");
let first_der_path = der_paths.first().expect("Cannot be empty");
// We also rule out xpubs with hardened derivation steps (non-normalized xpubs).
let valid = xpub.wildcard == descriptor::Wildcard::Unhardened
&& der_paths.len() == 2

3
src/spend.rs
View File

@ -547,8 +547,7 @@ pub fn create_spend(
})?;
fr
}
.try_into()
.expect("u16 must fit in f32");
.into();
let max_sat_wu = main_descriptor
.max_sat_weight()
.try_into()