frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cargo clippy warnings

Browse Source 
Disabled warnings for nursery/tmp_plan as it's going to be replaced
anyways
This commit is contained in:
Daniela Brozzoni
2023-03-02 19:08:33 +01:00
parent 1805bd35c0
commit c61b3604e1
26 changed files with 139 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/chain/tests/test_chain_graph.rs
View File

@@ -186,7 +186,7 @@ fn update_evicts_conflicting_tx() {
let _ = cg.insert_checkpoint(cp_a).expect("should insert cp");
let _ = cg.insert_checkpoint(cp_b).expect("should insert cp");
let _ = cg
.insert_tx(tx_a.clone(), TxHeight::Confirmed(0))
.insert_tx(tx_a, TxHeight::Confirmed(0))
.expect("should insert tx");
let _ = cg
.insert_tx(tx_b.clone(), TxHeight::Confirmed(1))
@@ -213,7 +213,7 @@ fn update_evicts_conflicting_tx() {
.into(),
},
graph: tx_graph::Additions {
tx: [tx_b2.clone()].into(),
tx: [tx_b2].into(),
txout: [].into(),
},
};
@@ -460,7 +460,7 @@ fn test_apply_changes_reintroduce_tx() {
let mut cg = ChainGraph::default();
let _ = cg.insert_checkpoint(block1).unwrap();
let _ = cg.insert_checkpoint(block2a).unwrap();
let _ = cg.insert_tx(tx1.clone(), TxHeight::Confirmed(1)).unwrap();
let _ = cg.insert_tx(tx1, TxHeight::Confirmed(1)).unwrap();
let _ = cg.insert_tx(tx2a.clone(), TxHeight::Confirmed(2)).unwrap();
cg
};
@@ -647,7 +647,7 @@ fn test_evict_descendants() {
);
let err = cg
.insert_tx_preview(tx_conflict.clone(), TxHeight::Unconfirmed)
.insert_tx_preview(tx_conflict, TxHeight::Unconfirmed)
.expect_err("must fail due to conflicts");
assert!(matches!(err, InsertTxError::UnresolvableConflict(_)));
}

18
crates/chain/tests/test_keychain_tracker.rs
View File

@@ -69,8 +69,8 @@ fn test_balance() {
let mut tracker = KeychainTracker::<Keychain, TxHeight>::default();
let one = Descriptor::from_str("tr([73c5da0a/86'/0'/0']xpub6BgBgsespWvERF3LHQu6CnqdvfEvtMcQjYrcRzx53QJjSxarj2afYWcLteoGVky7D3UKDP9QyrLprQ3VCECoY49yfdDEHGCtMMj92pReUsQ/0/*)#rg247h69").unwrap();
let two = Descriptor::from_str("tr([73c5da0a/86'/0'/0']xpub6BgBgsespWvERF3LHQu6CnqdvfEvtMcQjYrcRzx53QJjSxarj2afYWcLteoGVky7D3UKDP9QyrLprQ3VCECoY49yfdDEHGCtMMj92pReUsQ/1/*)#ju05rz2a").unwrap();
tracker.add_keychain(Keychain::One, one.clone());
tracker.add_keychain(Keychain::Two, two.clone());
tracker.add_keychain(Keychain::One, one);
tracker.add_keychain(Keychain::Two, two);
let tx1 = Transaction {
version: 0x01,
@@ -126,9 +126,9 @@ fn test_balance() {
})
.unwrap();
let should_trust = |keychain: &Keychain| match keychain {
&Keychain::One => false,
&Keychain::Two => true,
let should_trust = |keychain: &Keychain| match *keychain {
Keychain::One => false,
Keychain::Two => true,
};
assert_eq!(tracker.balance(should_trust), Balance::default());
@@ -172,9 +172,7 @@ fn test_balance() {
}
);
let _ = tracker
.insert_tx(tx1.clone(), TxHeight::Confirmed(1))
.unwrap();
let _ = tracker.insert_tx(tx1, TxHeight::Confirmed(1)).unwrap();
assert_eq!(
tracker.balance(should_trust),
@@ -186,9 +184,7 @@ fn test_balance() {
}
);
let _ = tracker
.insert_tx(tx2.clone(), TxHeight::Confirmed(2))
.unwrap();
let _ = tracker.insert_tx(tx2, TxHeight::Confirmed(2)).unwrap();
assert_eq!(
tracker.balance(should_trust),

4
crates/chain/tests/test_sparse_chain.rs
View File

@@ -147,8 +147,8 @@ fn invalidate_a_checkpoint_and_try_and_move_tx_when_it_wasnt_within_invalidation
chain1.determine_changeset(&chain2),
Err(UpdateError::TxInconsistent {
txid: h!("tx0"),
original_pos: TxHeight::Confirmed(0).into(),
update_pos: TxHeight::Confirmed(1).into(),
original_pos: TxHeight::Confirmed(0),
update_pos: TxHeight::Confirmed(1),
})
);
}

25
crates/chain/tests/test_spk_txout_index.rs
View File

@@ -42,10 +42,10 @@ fn spk_txout_sent_and_received() {
output: vec![
TxOut {
value: 20_000,
script_pubkey: spk2.clone(),
script_pubkey: spk2,
},
TxOut {
script_pubkey: spk1.clone(),
script_pubkey: spk1,
value: 30_000,
},
],
@@ -62,15 +62,15 @@ fn mark_used() {
let mut spk_index = SpkTxOutIndex::default();
spk_index.insert_spk(1, spk1.clone());
spk_index.insert_spk(2, spk2.clone());
spk_index.insert_spk(2, spk2);
assert_eq!(spk_index.is_used(&1), false);
assert!(!spk_index.is_used(&1));
spk_index.mark_used(&1);
assert_eq!(spk_index.is_used(&1), true);
assert!(spk_index.is_used(&1));
spk_index.unmark_used(&1);
assert_eq!(spk_index.is_used(&1), false);
assert!(!spk_index.is_used(&1));
spk_index.mark_used(&1);
assert_eq!(spk_index.is_used(&1), true);
assert!(spk_index.is_used(&1));
let tx1 = Transaction {
version: 0x02,
@@ -78,15 +78,14 @@ fn mark_used() {
input: vec![],
output: vec![TxOut {
value: 42_000,
script_pubkey: spk1.clone(),
script_pubkey: spk1,
}],
};
spk_index.scan(&tx1);
spk_index.unmark_used(&1);
assert_eq!(
assert!(
spk_index.is_used(&1),
true,
"even though we unmark_used it doesn't matter because there was a tx scanned that used it"
);
}
@@ -94,8 +93,8 @@ fn mark_used() {
#[test]
fn unmark_used_does_not_result_in_invalid_representation() {
let mut spk_index = SpkTxOutIndex::default();
assert_eq!(spk_index.unmark_used(&0), false);
assert_eq!(spk_index.unmark_used(&1), false);
assert_eq!(spk_index.unmark_used(&2), false);
assert!(!spk_index.unmark_used(&0));
assert!(!spk_index.unmark_used(&1));
assert!(!spk_index.unmark_used(&2));
assert!(spk_index.unused_spks(..).collect::<Vec<_>>().is_empty());
}

8
crates/chain/tests/test_tx_graph.rs
View File

@@ -128,10 +128,10 @@ fn insert_tx_graph_keeps_track_of_spend() {
let _ = graph1.insert_tx(tx2.clone());
let _ = graph2.insert_tx(tx2.clone());
let _ = graph2.insert_tx(tx1.clone());
let _ = graph2.insert_tx(tx1);
assert_eq!(
&*graph1.outspends(op),
graph1.outspends(op),
&iter::once(tx2.txid()).collect::<HashSet<_>>()
);
assert_eq!(graph2.outspends(op), graph1.outspends(op));
@@ -173,7 +173,7 @@ fn insert_tx_displaces_txouts() {
vout: 0,
},
TxOut {
value: 1337_000,
value: 1_337_000,
script_pubkey: Script::default(),
},
);
@@ -231,7 +231,7 @@ fn insert_txout_does_not_displace_tx() {
vout: 0,
},
TxOut {
value: 1337_000,
value: 1_337_000,
script_pubkey: Script::default(),
},
);