Skip to content

Commit 13de1f9

Browse files
jferrantjferrant
authored
Merge pull request #5698 from stacks-network/fix/clippy-ci-unnecessary-mut-passed
Fix clippy::unnecessary_mut_passed throughout
2 parents 22c5151 + 0b0dc56 commit 13de1f9

File tree

21 files changed

+136
-140
lines changed

21 files changed

+136
-140
lines changed

‎stackslib/src/burnchains/tests/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ fn mine_10_stacks_blocks_1_fork() {
969969
);
970970

971971
verify_keys_accepted(&mut node, &prev_keys);
972-
verify_commits_accepted(&mut node, &next_block_commits);
972+
verify_commits_accepted(&node, &next_block_commits);
973973

974974
prev_keys.clear();
975975
prev_keys.append(&mut next_prev_keys);
@@ -1017,7 +1017,7 @@ fn mine_10_stacks_blocks_2_forks_disjoint() {
10171017
);
10181018

10191019
verify_keys_accepted(&mut node, &prev_keys_1);
1020-
verify_commits_accepted(&mut node, &next_block_commits);
1020+
verify_commits_accepted(&node, &next_block_commits);
10211021

10221022
prev_keys_1.clear();
10231023
prev_keys_1.append(&mut next_prev_keys);
@@ -1078,10 +1078,10 @@ fn mine_10_stacks_blocks_2_forks_disjoint() {
10781078
assert!(next_snapshot_1.burn_header_hash != next_snapshot_2.burn_header_hash);
10791079

10801080
verify_keys_accepted(&mut node, &prev_keys_1);
1081-
verify_commits_accepted(&mut node, &next_block_commits_1);
1081+
verify_commits_accepted(&node, &next_block_commits_1);
10821082

10831083
verify_keys_accepted(&mut node, &prev_keys_2);
1084-
verify_commits_accepted(&mut node, &next_block_commits_2);
1084+
verify_commits_accepted(&node, &next_block_commits_2);
10851085

10861086
prev_keys_1.clear();
10871087
prev_keys_1.append(&mut next_prev_keys_1);
@@ -1132,7 +1132,7 @@ fn mine_10_stacks_blocks_2_forks_disjoint_same_blocks() {
11321132
);
11331133

11341134
verify_keys_accepted(&mut node, &prev_keys_1);
1135-
verify_commits_accepted(&mut node, &next_block_commits);
1135+
verify_commits_accepted(&node, &next_block_commits);
11361136

11371137
prev_keys_1.clear();
11381138
prev_keys_1.append(&mut next_prev_keys);
@@ -1205,10 +1205,10 @@ fn mine_10_stacks_blocks_2_forks_disjoint_same_blocks() {
12051205
}
12061206

12071207
verify_keys_accepted(&mut node, &prev_keys_1);
1208-
verify_commits_accepted(&mut node, &next_block_commits_1);
1208+
verify_commits_accepted(&node, &next_block_commits_1);
12091209

12101210
verify_keys_accepted(&mut node, &prev_keys_2);
1211-
verify_commits_accepted(&mut node, &next_block_commits_2);
1211+
verify_commits_accepted(&node, &next_block_commits_2);
12121212

12131213
prev_keys_1.clear();
12141214
prev_keys_1.append(&mut next_prev_keys_1);

‎stackslib/src/chainstate/burn/db/sortdb.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8869,7 +8869,7 @@ pub mod tests {
88698869
.get_stacks_header_hashes(
88708870
256,
88718871
&canonical_tip.consensus_hash,
8872-
&mut BlockHeaderCache::new(),
8872+
&BlockHeaderCache::new(),
88738873
)
88748874
.unwrap();
88758875
SortitionDB::merge_block_header_cache(&mut cache, &hashes);
@@ -8911,7 +8911,7 @@ pub mod tests {
89118911
.get_stacks_header_hashes(
89128912
192,
89138913
&canonical_tip.consensus_hash,
8914-
&mut BlockHeaderCache::new(),
8914+
&BlockHeaderCache::new(),
89158915
)
89168916
.unwrap();
89178917
SortitionDB::merge_block_header_cache(&mut cache, &hashes);
@@ -8951,7 +8951,7 @@ pub mod tests {
89518951
.get_stacks_header_hashes(
89528952
257,
89538953
&canonical_tip.consensus_hash,
8954-
&mut BlockHeaderCache::new(),
8954+
&BlockHeaderCache::new(),
89558955
)
89568956
.unwrap();
89578957
SortitionDB::merge_block_header_cache(&mut cache, &hashes);

‎stackslib/src/chainstate/coordinator/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ pub fn get_reward_cycle_info<U: RewardSetProvider>(
864864

865865
let mut tx = sort_db.tx_begin()?;
866866
let preprocessed_reward_set =
867-
SortitionDB::get_preprocessed_reward_set(&mut tx, &first_prepare_sn.sortition_id)?;
867+
SortitionDB::get_preprocessed_reward_set(&tx, &first_prepare_sn.sortition_id)?;
868868

869869
// It's possible that we haven't processed the PoX anchor block at the time we have
870870
// processed the burnchain block which commits to it. In this case, the PoX anchor block
@@ -2308,9 +2308,9 @@ impl<
23082308
canonical_snapshot.canonical_stacks_tip_height,
23092309
);
23102310

2311-
let mut tx = self.sortition_db.tx_begin()?;
2311+
let tx = self.sortition_db.tx_begin()?;
23122312
SortitionDB::revalidate_snapshot_with_block(
2313-
&mut tx,
2313+
&tx,
23142314
&new_sortition_id,
23152315
&canonical_snapshot.canonical_stacks_tip_consensus_hash,
23162316
&canonical_snapshot.canonical_stacks_tip_hash,

‎stackslib/src/chainstate/stacks/db/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1712,7 +1712,7 @@ impl StacksChainState {
17121712
);
17131713

17141714
StacksChainState::insert_stacks_block_header(
1715-
&mut tx,
1715+
&tx,
17161716
&parent_hash,
17171717
&first_tip_info,
17181718
&ExecutionCost::ZERO,

‎stackslib/src/chainstate/stacks/tests/chain_histories.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ where
134134
node.add_key_register(&mut burn_block, &mut miner);
135135

136136
let (stacks_block, microblocks, block_commit_op) = node.mine_stacks_block(
137-
&mut burn_node.sortdb,
137+
&burn_node.sortdb,
138138
&mut miner,
139139
&mut burn_block,
140140
&last_key,
@@ -320,7 +320,7 @@ where
320320
node.add_key_register(&mut burn_block, &mut miner_2);
321321

322322
let (stacks_block, microblocks, block_commit_op) = node.mine_stacks_block(
323-
&mut burn_node.sortdb,
323+
&burn_node.sortdb,
324324
&mut miner_1,
325325
&mut burn_block,
326326
&last_key,
@@ -464,7 +464,7 @@ where
464464
node.add_key_register(&mut burn_block, &mut miner_2);
465465

466466
let (stacks_block_1, microblocks_1, block_commit_op_1) = node.mine_stacks_block(
467-
&mut burn_node.sortdb,
467+
&burn_node.sortdb,
468468
&mut miner_1,
469469
&mut burn_block,
470470
&last_key_1,
@@ -512,7 +512,7 @@ where
512512
);
513513

514514
let (stacks_block_2, microblocks_2, block_commit_op_2) = node.mine_stacks_block(
515-
&mut burn_node.sortdb,
515+
&burn_node.sortdb,
516516
&mut miner_2,
517517
&mut burn_block,
518518
&last_key_2,
@@ -801,7 +801,7 @@ where
801801
node.add_key_register(&mut burn_block, &mut miner_2);
802802

803803
let (stacks_block_1, microblocks_1, block_commit_op_1) = node.mine_stacks_block(
804-
&mut burn_node.sortdb,
804+
&burn_node.sortdb,
805805
&mut miner_1,
806806
&mut burn_block,
807807
&last_key_1,
@@ -849,7 +849,7 @@ where
849849
);
850850

851851
let (stacks_block_2, microblocks_2, block_commit_op_2) = node.mine_stacks_block(
852-
&mut burn_node.sortdb,
852+
&burn_node.sortdb,
853853
&mut miner_2,
854854
&mut burn_block,
855855
&last_key_2,
@@ -1065,7 +1065,7 @@ where
10651065
node_2.add_key_register(&mut burn_block, &mut miner_2);
10661066

10671067
let (stacks_block_1, microblocks_1, block_commit_op_1) = node.mine_stacks_block(
1068-
&mut burn_node.sortdb,
1068+
&burn_node.sortdb,
10691069
&mut miner_1,
10701070
&mut burn_block,
10711071
&last_key_1,
@@ -1114,7 +1114,7 @@ where
11141114
);
11151115

11161116
let (stacks_block_2, microblocks_2, block_commit_op_2) = node_2.mine_stacks_block(
1117-
&mut burn_node.sortdb,
1117+
&burn_node.sortdb,
11181118
&mut miner_2,
11191119
&mut burn_block,
11201120
&last_key_2,
@@ -1417,7 +1417,7 @@ where
14171417
node.add_key_register(&mut burn_block, &mut miner_2);
14181418

14191419
let (stacks_block_1, microblocks_1, block_commit_op_1) = node.mine_stacks_block(
1420-
&mut burn_node.sortdb,
1420+
&burn_node.sortdb,
14211421
&mut miner_1,
14221422
&mut burn_block,
14231423
&last_key_1,
@@ -1462,7 +1462,7 @@ where
14621462
);
14631463

14641464
let (stacks_block_2, microblocks_2, block_commit_op_2) = node.mine_stacks_block(
1465-
&mut burn_node.sortdb,
1465+
&burn_node.sortdb,
14661466
&mut miner_2,
14671467
&mut burn_block,
14681468
&last_key_2,
@@ -1661,7 +1661,7 @@ where
16611661
get_last_microblock_header(&node, &miner_2, parent_block_opt_2.as_ref());
16621662

16631663
let (stacks_block_1, microblocks_1, block_commit_op_1) = node.mine_stacks_block(
1664-
&mut burn_node.sortdb,
1664+
&burn_node.sortdb,
16651665
&mut miner_1,
16661666
&mut burn_block_1,
16671667
&last_key_1,
@@ -1709,7 +1709,7 @@ where
17091709
);
17101710

17111711
let (stacks_block_2, microblocks_2, block_commit_op_2) = node.mine_stacks_block(
1712-
&mut burn_node.sortdb,
1712+
&burn_node.sortdb,
17131713
&mut miner_2,
17141714
&mut burn_block_2,
17151715
&last_key_2,
@@ -1972,7 +1972,7 @@ where
19721972
node.add_key_register(&mut burn_block, &mut miner_2);
19731973

19741974
let (stacks_block_1, microblocks_1, block_commit_op_1) = node.mine_stacks_block(
1975-
&mut burn_node.sortdb,
1975+
&burn_node.sortdb,
19761976
&mut miner_1,
19771977
&mut burn_block,
19781978
&last_key_1,
@@ -2017,7 +2017,7 @@ where
20172017
);
20182018

20192019
let (stacks_block_2, microblocks_2, block_commit_op_2) = node.mine_stacks_block(
2020-
&mut burn_node.sortdb,
2020+
&burn_node.sortdb,
20212021
&mut miner_2,
20222022
&mut burn_block,
20232023
&last_key_2,
@@ -2216,7 +2216,7 @@ where
22162216
get_last_microblock_header(&node, &miner_2, parent_block_opt_2.as_ref());
22172217

22182218
let (stacks_block_1, microblocks_1, block_commit_op_1) = node.mine_stacks_block(
2219-
&mut burn_node.sortdb,
2219+
&burn_node.sortdb,
22202220
&mut miner_1,
22212221
&mut burn_block_1,
22222222
&last_key_1,
@@ -2264,7 +2264,7 @@ where
22642264
);
22652265

22662266
let (stacks_block_2, microblocks_2, block_commit_op_2) = node.mine_stacks_block(
2267-
&mut burn_node.sortdb,
2267+
&burn_node.sortdb,
22682268
&mut miner_2,
22692269
&mut burn_block_2,
22702270
&last_key_2,

0 commit comments

Comments
 (0)