Skip to content

Commit 541ec42

Browse files
jferrantjferrant
committed
Fix clippy::needless_borrow throughout stackslib
Signed-off-by: Jacinta Ferrant <[email protected]>
1 parent 8c23c0e commit 541ec42

File tree

132 files changed

+1532
-1603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+1532
-1603
lines changed

‎stackslib/src/burnchains/affirmation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ pub fn read_prepare_phase_commits<B: BurnchainHeaderReader>(
557557

558558
let mut ret = vec![];
559559
for header in headers.into_iter() {
560-
let blk = BurnchainDB::get_burnchain_block(&burnchain_tx.conn(), &header.block_hash)
560+
let blk = BurnchainDB::get_burnchain_block(burnchain_tx.conn(), &header.block_hash)
561561
.unwrap_or_else(|_| {
562562
panic!(
563563
"BUG: failed to load prepare-phase block {} ({})",
@@ -1126,7 +1126,7 @@ pub fn find_pox_anchor_block<B: BurnchainHeaderReader>(
11261126
let prepare_ops_valid =
11271127
inner_find_valid_prepare_phase_commits(burnchain_tx, reward_cycle, indexer, burnchain)?;
11281128
let anchor_block_and_descendancy_opt = find_heaviest_block_commit(
1129-
&burnchain_tx,
1129+
burnchain_tx,
11301130
indexer,
11311131
&prepare_ops_valid,
11321132
burnchain.pox_constants.anchor_threshold,

‎stackslib/src/burnchains/bitcoin/address.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ impl SegwitBitcoinAddress {
290290
let mut bytes_u5: Vec<u5> = vec![u5::try_from_u8(self.witness_version())
291291
.expect("FATAL: bad witness version does not fit into a u5")];
292292
bytes_u5.extend_from_slice(&bytes.to_base32());
293-
let addr = bech32::encode(&hrp, bytes_u5, self.bech32_variant())
293+
let addr = bech32::encode(hrp, bytes_u5, self.bech32_variant())
294294
.expect("FATAL: could not encode segwit address");
295295
addr
296296
}

‎stackslib/src/burnchains/bitcoin/bits.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl BitcoinTxInputStructured {
5959
let i2 = &instructions[1];
6060

6161
match (i1, i2) {
62-
(Instruction::PushBytes(ref _data1), Instruction::PushBytes(ref data2)) => {
62+
(Instruction::PushBytes(_data1), Instruction::PushBytes(data2)) => {
6363
// data2 is a pubkey?
6464
match BitcoinPublicKey::from_slice(data2) {
6565
Ok(pubkey) => {
@@ -1277,7 +1277,7 @@ mod tests {
12771277
let raw_in = BitcoinTxInputRaw::from_bitcoin_witness_script_sig(
12781278
&txin.script_sig,
12791279
txin.witness.clone(),
1280-
to_txid(&txin),
1280+
to_txid(txin),
12811281
);
12821282
assert_eq!(raw_in, inputs[i]);
12831283
}
@@ -1290,7 +1290,7 @@ mod tests {
12901290
}
12911291

12921292
let segwit_out =
1293-
BitcoinTxOutput::from_bitcoin_txout(BitcoinNetworkType::Mainnet, &txout)
1293+
BitcoinTxOutput::from_bitcoin_txout(BitcoinNetworkType::Mainnet, txout)
12941294
.unwrap();
12951295
assert_eq!(segwit_out, outputs[j]);
12961296
j += 1;

‎stackslib/src/burnchains/bitcoin/blocks.rs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,7 @@ impl BitcoinBlockParser {
253253
}
254254

255255
// block transactions must match header merkle root
256-
let tx_merkle_root =
257-
bitcoin_merkle_root(block.txdata.iter().map(|ref tx| tx.txid()).collect());
256+
let tx_merkle_root = bitcoin_merkle_root(block.txdata.iter().map(|tx| tx.txid()).collect());
258257

259258
if block.header.merkle_root != tx_merkle_root {
260259
return false;
@@ -275,15 +274,15 @@ impl BitcoinBlockParser {
275274
return None;
276275
}
277276

278-
let script_pieces = bits::parse_script(&data_output);
277+
let script_pieces = bits::parse_script(data_output);
279278
if script_pieces.len() != 2 {
280279
// not OP_RETURN <data>
281280
test_debug!("Data output does not encode a valid OP_RETURN");
282281
return None;
283282
}
284283

285284
match (&script_pieces[0], &script_pieces[1]) {
286-
(Instruction::Op(ref opcode), Instruction::PushBytes(ref data)) => {
285+
(Instruction::Op(ref opcode), Instruction::PushBytes(data)) => {
287286
if *opcode != btc_opcodes::OP_RETURN {
288287
test_debug!("Data output does not use a standard OP_RETURN");
289288
return None;
@@ -351,7 +350,7 @@ impl BitcoinBlockParser {
351350
fn parse_inputs_structured(tx: &Transaction) -> Option<Vec<BitcoinTxInput>> {
352351
let mut ret = vec![];
353352
for inp in &tx.input {
354-
match BitcoinTxInput::from_bitcoin_txin_structured(&inp) {
353+
match BitcoinTxInput::from_bitcoin_txin_structured(inp) {
355354
None => {
356355
test_debug!("Failed to parse input");
357356
return None;
@@ -369,7 +368,7 @@ impl BitcoinBlockParser {
369368
fn parse_inputs_raw(tx: &Transaction) -> Vec<BitcoinTxInput> {
370369
let mut ret = vec![];
371370
for inp in &tx.input {
372-
ret.push(BitcoinTxInput::from_bitcoin_txin_raw(&inp));
371+
ret.push(BitcoinTxInput::from_bitcoin_txin_raw(inp));
373372
}
374373
ret
375374
}
@@ -388,9 +387,9 @@ impl BitcoinBlockParser {
388387
let mut ret = vec![];
389388
for outp in &tx.output[1..tx.output.len()] {
390389
let out_opt = if BitcoinBlockParser::allow_segwit_outputs(epoch_id) {
391-
BitcoinTxOutput::from_bitcoin_txout(self.network_id, &outp)
390+
BitcoinTxOutput::from_bitcoin_txout(self.network_id, outp)
392391
} else {
393-
BitcoinTxOutput::from_bitcoin_txout_legacy(self.network_id, &outp)
392+
BitcoinTxOutput::from_bitcoin_txout_legacy(self.network_id, outp)
394393
};
395394
match out_opt {
396395
None => {
@@ -509,7 +508,7 @@ impl BitcoinBlockParser {
509508
}
510509

511510
// parse it
512-
let burn_block = self.parse_block(&block, height, epoch_id);
511+
let burn_block = self.parse_block(block, height, epoch_id);
513512
Some(burn_block)
514513
}
515514
}
@@ -525,7 +524,7 @@ impl BurnchainBlockParser for BitcoinBlockParser {
525524
match ipc_block.block_message {
526525
btc_message::NetworkMessage::Block(ref block) => {
527526
match self.process_block(
528-
&block,
527+
block,
529528
&ipc_block.header_data.block_header,
530529
ipc_block.header_data.block_height,
531530
epoch_id,

‎stackslib/src/burnchains/bitcoin/indexer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ impl BitcoinIndexer {
469469
network_id: BitcoinNetworkType,
470470
) -> Result<SpvClient, btc_error> {
471471
SpvClient::new_without_migration(
472-
&reorg_headers_path,
472+
reorg_headers_path,
473473
start_block,
474474
end_block,
475475
network_id,
@@ -486,7 +486,7 @@ impl BitcoinIndexer {
486486
network_id: BitcoinNetworkType,
487487
) -> Result<SpvClient, btc_error> {
488488
SpvClient::new(
489-
&reorg_headers_path,
489+
reorg_headers_path,
490490
start_block,
491491
end_block,
492492
network_id,
@@ -3476,7 +3476,7 @@ mod test {
34763476

34773477
// set up SPV client so we don't have chain work at first
34783478
let mut spv_client = SpvClient::new_without_migration(
3479-
&db_path,
3479+
db_path,
34803480
0,
34813481
None,
34823482
BitcoinNetworkType::Regtest,

‎stackslib/src/burnchains/bitcoin/spv.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -724,13 +724,13 @@ impl SpvClient {
724724
.next()
725725
.map_err(|e| btc_error::DBError(db_error::SqliteError(e)))?
726726
{
727-
let height: u64 = u64::from_column(&row, "height")?;
727+
let height: u64 = u64::from_column(row, "height")?;
728728
if height != next_height {
729729
break;
730730
}
731731
next_height += 1;
732732

733-
let next_header = BlockHeader::from_row(&row)?;
733+
let next_header = BlockHeader::from_row(row)?;
734734
headers.push(LoneBlockHeader {
735735
header: next_header,
736736
tx_count: VarInt(0),

‎stackslib/src/burnchains/burnchain.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ impl BurnchainStateTransition {
9898

9999
/// Get the transaction IDs of all accepted burnchain operations in this block
100100
pub fn txids(&self) -> Vec<Txid> {
101-
self.accepted_ops.iter().map(|ref op| op.txid()).collect()
101+
self.accepted_ops.iter().map(|op| op.txid()).collect()
102102
}
103103

104104
/// Get the sum of all burnchain tokens spent in this burnchain block's accepted operations
@@ -196,7 +196,7 @@ impl BurnchainStateTransition {
196196

197197
// find all VRF leader keys that were consumed by the block commits of this block
198198
let consumed_leader_keys =
199-
sort_tx.get_consumed_leader_keys(&parent_snapshot, &block_commits)?;
199+
sort_tx.get_consumed_leader_keys(parent_snapshot, &block_commits)?;
200200

201201
// assemble the commit windows
202202
let mut windowed_block_commits = vec![block_commits];
@@ -355,7 +355,7 @@ impl BurnchainStateTransition {
355355
);
356356
}
357357

358-
accepted_ops.sort_by(|ref a, ref b| a.vtxindex().partial_cmp(&b.vtxindex()).unwrap());
358+
accepted_ops.sort_by(|a, b| a.vtxindex().partial_cmp(&b.vtxindex()).unwrap());
359359

360360
Ok(BurnchainStateTransition {
361361
burn_dist,
@@ -425,7 +425,7 @@ impl BurnchainBlock {
425425
BurnchainBlock::Bitcoin(ref data) => data
426426
.txs
427427
.iter()
428-
.map(|ref tx| BurnchainTransaction::Bitcoin((*tx).clone()))
428+
.map(|tx| BurnchainTransaction::Bitcoin((*tx).clone()))
429429
.collect(),
430430
}
431431
}
@@ -850,7 +850,7 @@ impl Burnchain {
850850
}
851851
x if x == Opcodes::TransferStx as u8 => {
852852
let pre_stx_txid = TransferStxOp::get_sender_txid(burn_tx).ok()?;
853-
let pre_stx_tx = match pre_stx_op_map.get(&pre_stx_txid) {
853+
let pre_stx_tx = match pre_stx_op_map.get(pre_stx_txid) {
854854
Some(tx_ref) => Some(BlockstackOperationType::PreStx(tx_ref.clone())),
855855
None => burnchain_db.find_burnchain_op(indexer, pre_stx_txid),
856856
};
@@ -879,7 +879,7 @@ impl Burnchain {
879879
}
880880
x if x == Opcodes::StackStx as u8 => {
881881
let pre_stx_txid = StackStxOp::get_sender_txid(burn_tx).ok()?;
882-
let pre_stx_tx = match pre_stx_op_map.get(&pre_stx_txid) {
882+
let pre_stx_tx = match pre_stx_op_map.get(pre_stx_txid) {
883883
Some(tx_ref) => Some(BlockstackOperationType::PreStx(tx_ref.clone())),
884884
None => burnchain_db.find_burnchain_op(indexer, pre_stx_txid),
885885
};
@@ -914,7 +914,7 @@ impl Burnchain {
914914
}
915915
x if x == Opcodes::DelegateStx as u8 => {
916916
let pre_stx_txid = DelegateStxOp::get_sender_txid(burn_tx).ok()?;
917-
let pre_stx_tx = match pre_stx_op_map.get(&pre_stx_txid) {
917+
let pre_stx_tx = match pre_stx_op_map.get(pre_stx_txid) {
918918
Some(tx_ref) => Some(BlockstackOperationType::PreStx(tx_ref.clone())),
919919
None => burnchain_db.find_burnchain_op(indexer, pre_stx_txid),
920920
};
@@ -943,7 +943,7 @@ impl Burnchain {
943943
}
944944
x if x == Opcodes::VoteForAggregateKey as u8 => {
945945
let pre_stx_txid = VoteForAggregateKeyOp::get_sender_txid(burn_tx).ok()?;
946-
let pre_stx_tx = match pre_stx_op_map.get(&pre_stx_txid) {
946+
let pre_stx_tx = match pre_stx_op_map.get(pre_stx_txid) {
947947
Some(tx_ref) => Some(BlockstackOperationType::PreStx(tx_ref.clone())),
948948
None => burnchain_db.find_burnchain_op(indexer, pre_stx_txid),
949949
};
@@ -1039,7 +1039,7 @@ impl Burnchain {
10391039
);
10401040

10411041
let _blockstack_txs =
1042-
burnchain_db.store_new_burnchain_block(burnchain, indexer, &block, epoch_id)?;
1042+
burnchain_db.store_new_burnchain_block(burnchain, indexer, block, epoch_id)?;
10431043
Burnchain::process_affirmation_maps(
10441044
burnchain,
10451045
burnchain_db,
@@ -1111,7 +1111,7 @@ impl Burnchain {
11111111
let blockstack_txs = burnchain_db.store_new_burnchain_block(
11121112
burnchain,
11131113
indexer,
1114-
&block,
1114+
block,
11151115
cur_epoch.epoch_id,
11161116
)?;
11171117

‎stackslib/src/burnchains/db.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ pub(crate) fn apply_blockstack_txs_safety_checks(
152152
);
153153

154154
// safety -- make sure these are in order
155-
blockstack_txs.sort_by(|ref a, ref b| a.vtxindex().partial_cmp(&b.vtxindex()).unwrap());
155+
blockstack_txs.sort_by(|a, b| a.vtxindex().partial_cmp(&b.vtxindex()).unwrap());
156156

157157
// safety -- no duplicate vtxindex (shouldn't happen but crash if so)
158158
if blockstack_txs.len() > 1 {
@@ -349,7 +349,7 @@ impl BurnchainDBTransaction<'_> {
349349
let args = params![affirmation_map.encode(), u64_to_sql(weight)?];
350350
match self.sql_tx.execute(sql, args) {
351351
Ok(_) => {
352-
let am_id = BurnchainDB::get_affirmation_map_id(&self.sql_tx, &affirmation_map)?
352+
let am_id = BurnchainDB::get_affirmation_map_id(&self.sql_tx, affirmation_map)?
353353
.expect("BUG: no affirmation ID for affirmation map we just inserted");
354354
Ok(am_id)
355355
}
@@ -1231,7 +1231,7 @@ impl BurnchainDB {
12311231
self,
12321232
block_header,
12331233
epoch_id,
1234-
&tx,
1234+
tx,
12351235
&pre_stx_ops,
12361236
);
12371237
if let Some(classified_tx) = result {
@@ -1409,7 +1409,7 @@ impl BurnchainDB {
14091409
blockstack_ops.len()
14101410
);
14111411
db_tx.store_burnchain_db_entry(block_header)?;
1412-
db_tx.store_blockstack_ops(burnchain, indexer, &block_header, blockstack_ops)?;
1412+
db_tx.store_blockstack_ops(burnchain, indexer, block_header, blockstack_ops)?;
14131413

14141414
db_tx.commit()?;
14151415
Ok(())
@@ -1459,7 +1459,7 @@ impl BurnchainDB {
14591459
) -> Result<Option<LeaderBlockCommitOp>, DBError> {
14601460
let qry = "SELECT txid FROM block_commit_metadata WHERE block_height = ?1 AND vtxindex = ?2 AND burn_block_hash = ?3";
14611461
let args = params![block_ptr, vtxindex, header_hash];
1462-
let txid = match query_row(&conn, qry, args) {
1462+
let txid = match query_row(conn, qry, args) {
14631463
Ok(Some(txid)) => txid,
14641464
Ok(None) => {
14651465
test_debug!(

‎stackslib/src/burnchains/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ impl BurnchainTransaction {
231231
BurnchainTransaction::Bitcoin(ref btc) => btc
232232
.outputs
233233
.iter()
234-
.map(|ref o| BurnchainRecipient::try_from_bitcoin_output(o))
234+
.map(BurnchainRecipient::try_from_bitcoin_output)
235235
.collect(),
236236
}
237237
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ pub fn make_reward_cycle_with_vote(
331331
let mut commits = vec![];
332332
for i in 0..parent_commits.len() {
333333
let mut block_commit = make_simple_block_commit(
334-
&burnchain,
334+
burnchain,
335335
parent_commits[i].as_ref(),
336336
&block_header,
337337
next_block_hash(),
@@ -388,7 +388,7 @@ pub fn make_reward_cycle_with_vote(
388388
block_commit.parent_vtxindex
389389
);
390390

391-
if let Some(ref parent_commit) = parent_commits[i].as_ref() {
391+
if let Some(parent_commit) = parent_commits[i].as_ref() {
392392
assert!(parent_commit.block_height != block_commit.block_height);
393393
assert!(
394394
parent_commit.block_height == u64::from(block_commit.parent_block_ptr)

0 commit comments

Comments
 (0)