Skip to content

Commit f95abc5

Browse files
jferrantjferrant
committed
Apply clippy::unnecessary_to_owned and clippy::unwrap_or_default
Signed-off-by: Jacinta Ferrant <[email protected]>
1 parent a2ef22e commit f95abc5

File tree

33 files changed

+116
-126
lines changed

33 files changed

+116
-126
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ impl BitcoinBlockParser {
437437
match (inputs_opt, outputs_opt) {
438438
(Some(inputs), Some(outputs)) => {
439439
Some(BitcoinTransaction {
440-
txid: Txid::from_vec_be(&tx.txid().as_bytes().to_vec()).unwrap(), // this *should* panic if it fails
440+
txid: Txid::from_vec_be(tx.txid().as_bytes().as_ref()).unwrap(), // this *should* panic if it fails
441441
vtxindex: vtxindex as u32,
442442
opcode,
443443
data,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ impl BitcoinIndexer {
227227

228228
// instantiate headers DB
229229
let _ = SpvClient::new(
230-
&working_dir_path.to_str().unwrap().to_string(),
230+
working_dir_path.to_str().unwrap(),
231231
0,
232232
None,
233233
BitcoinNetworkType::Regtest,
@@ -236,7 +236,7 @@ impl BitcoinIndexer {
236236
)
237237
.expect(&format!(
238238
"Failed to open {:?}",
239-
&working_dir_path.to_str().unwrap().to_string()
239+
working_dir_path.to_str().unwrap()
240240
));
241241

242242
BitcoinIndexer {

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,15 @@ impl TestMiner {
241241
);
242242
match self.vrf_key_map.get(vrf_pubkey) {
243243
Some(ref prover_key) => {
244-
let proof = VRF::prove(prover_key, &last_sortition_hash.as_bytes().to_vec());
245-
let valid =
246-
match VRF::verify(vrf_pubkey, &proof, &last_sortition_hash.as_bytes().to_vec())
247-
{
248-
Ok(v) => v,
249-
Err(e) => false,
250-
};
244+
let proof = VRF::prove(prover_key, last_sortition_hash.as_bytes().as_ref());
245+
let valid = match VRF::verify(
246+
vrf_pubkey,
247+
&proof,
248+
last_sortition_hash.as_bytes().as_ref(),
249+
) {
250+
Ok(v) => v,
251+
Err(e) => false,
252+
};
251253
assert!(valid);
252254
Some(proof)
253255
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ pub fn setup_states_with_epochs(
369369
);
370370

371371
let block_limit = ExecutionCost::max_value();
372-
let initial_balances = initial_balances.unwrap_or(vec![]);
372+
let initial_balances = initial_balances.unwrap_or_default();
373373
for path in paths.iter() {
374374
let burnchain = get_burnchain(path, pox_consts.clone());
375375

‎stackslib/src/chainstate/nakamoto/coordinator/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ pub fn make_replay_peer<'a>(peer: &mut TestPeer<'a>) -> TestPeer<'a> {
237237
replay_config.http_port = 0;
238238
replay_config.test_stackers = peer.config.test_stackers.clone();
239239

240-
let test_stackers = replay_config.test_stackers.clone().unwrap_or(vec![]);
240+
let test_stackers = replay_config.test_stackers.clone().unwrap_or_default();
241241
let mut test_signers = replay_config.test_signers.clone().unwrap();
242242
let mut replay_peer = TestPeer::new(replay_config);
243243
let observer = TestEventObserver::new();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4123,7 +4123,7 @@ impl NakamotoChainState {
41234123
.iter()
41244124
.enumerate()
41254125
.fold(HashMap::new(), |mut map, (ix, addr)| {
4126-
map.entry(addr).or_insert_with(Vec::new).push(ix);
4126+
map.entry(addr).or_default().push(ix);
41274127
map
41284128
});
41294129

@@ -4524,7 +4524,7 @@ impl NakamotoChainState {
45244524
let matured_rewards = matured_miner_rewards_opt
45254525
.as_ref()
45264526
.map(|matured_miner_rewards| matured_miner_rewards.consolidate())
4527-
.unwrap_or(vec![]);
4527+
.unwrap_or_default();
45284528

45294529
let mut lockup_events =
45304530
match Self::finish_block(&mut clarity_tx, matured_miner_rewards_opt.as_ref()) {

‎stackslib/src/chainstate/nakamoto/tests/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ pub fn test_nakamoto_first_tenure_block_syntactic_validation() {
259259
};
260260

261261
let proof_bytes = hex_bytes("9275df67a68c8745c0ff97b48201ee6db447f7c93b23ae24cdc2400f52fdb08a1a6ac7ec71bf9c9c76e96ee4675ebff60625af28718501047bfd87b810c2d2139b73c23bd69de66360953a642c2a330a").unwrap();
262-
let proof = VRFProof::from_bytes(&proof_bytes[..].to_vec()).unwrap();
262+
let proof = VRFProof::from_bytes(&proof_bytes[..]).unwrap();
263263

264264
let coinbase_payload =
265265
TransactionPayload::Coinbase(CoinbasePayload([0x12; 32]), None, Some(proof.clone()));
@@ -591,10 +591,10 @@ pub fn test_load_store_update_nakamoto_blocks() {
591591

592592
let private_key = StacksPrivateKey::new();
593593
let epoch2_proof_bytes = hex_bytes("9275df67a68c8745c0ff97b48201ee6db447f7c93b23ae24cdc2400f52fdb08a1a6ac7ec71bf9c9c76e96ee4675ebff60625af28718501047bfd87b810c2d2139b73c23bd69de66360953a642c2a330a").unwrap();
594-
let epoch2_proof = VRFProof::from_bytes(&epoch2_proof_bytes[..].to_vec()).unwrap();
594+
let epoch2_proof = VRFProof::from_bytes(&epoch2_proof_bytes[..]).unwrap();
595595

596596
let nakamoto_proof_bytes = hex_bytes("973c815ac3e81a4aff3243f3d8310d24ab9783acd6caa4dcfab20a3744584b2f966acf08140e1a7e1e685695d51b1b511f4f19260a21887244a6c47f7637b8bdeaf5eafe85c1975bab75bc0668fe8a0b").unwrap();
597-
let nakamoto_proof = VRFProof::from_bytes(&nakamoto_proof_bytes[..].to_vec()).unwrap();
597+
let nakamoto_proof = VRFProof::from_bytes(&nakamoto_proof_bytes[..]).unwrap();
598598

599599
let coinbase_payload = TransactionPayload::Coinbase(
600600
CoinbasePayload([0x12; 32]),

‎stackslib/src/chainstate/stacks/block.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ mod test {
969969
#[test]
970970
fn codec_stacks_block_ecvrf_proof() {
971971
let proof_bytes = hex_bytes("9275df67a68c8745c0ff97b48201ee6db447f7c93b23ae24cdc2400f52fdb08a1a6ac7ec71bf9c9c76e96ee4675ebff60625af28718501047bfd87b810c2d2139b73c23bd69de66360953a642c2a330a").unwrap();
972-
let proof = VRFProof::from_bytes(&proof_bytes[..].to_vec()).unwrap();
972+
let proof = VRFProof::from_bytes(&proof_bytes[..]).unwrap();
973973

974974
check_codec_and_corruption::<VRFProof>(&proof, &proof_bytes);
975975
}
@@ -991,7 +991,7 @@ mod test {
991991
#[test]
992992
fn codec_stacks_block_header() {
993993
let proof_bytes = hex_bytes("9275df67a68c8745c0ff97b48201ee6db447f7c93b23ae24cdc2400f52fdb08a1a6ac7ec71bf9c9c76e96ee4675ebff60625af28718501047bfd87b810c2d2139b73c23bd69de66360953a642c2a330a").unwrap();
994-
let proof = VRFProof::from_bytes(&proof_bytes[..].to_vec()).unwrap();
994+
let proof = VRFProof::from_bytes(&proof_bytes[..]).unwrap();
995995

996996
let header = StacksBlockHeader {
997997
version: 0x12,
@@ -1710,7 +1710,7 @@ mod test {
17101710
tx_merkle_root
17111711
};
17121712
let mut block_header_dup_tx = header.clone();
1713-
block_header_dup_tx.tx_merkle_root = get_tx_root(&txs.to_vec());
1713+
block_header_dup_tx.tx_merkle_root = get_tx_root(txs);
17141714

17151715
let block = StacksBlock {
17161716
header: block_header_dup_tx,
@@ -1957,7 +1957,7 @@ mod test {
19571957
);
19581958

19591959
let proof_bytes = hex_bytes("9275df67a68c8745c0ff97b48201ee6db447f7c93b23ae24cdc2400f52fdb08a1a6ac7ec71bf9c9c76e96ee4675ebff60625af28718501047bfd87b810c2d2139b73c23bd69de66360953a642c2a330a").unwrap();
1960-
let proof = VRFProof::from_bytes(&proof_bytes[..].to_vec()).unwrap();
1960+
let proof = VRFProof::from_bytes(&proof_bytes[..]).unwrap();
19611961
let tx_coinbase_proof = StacksTransaction::new(
19621962
TransactionVersion::Testnet,
19631963
origin_auth.clone(),

‎stackslib/src/chainstate/stacks/boot/pox_4_tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7592,8 +7592,8 @@ fn test_deser_abort() {
75927592
";
75937593

75947594
let tx_payload = TransactionPayload::new_smart_contract(
7595-
&format!("hello-world"),
7596-
&contract.to_string(),
7595+
"hello-world",
7596+
contract,
75977597
Some(ClarityVersion::Clarity2),
75987598
)
75997599
.unwrap();

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

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,11 +1209,9 @@ mod test {
12091209
fn get_tip_ancestor() {
12101210
let mut chainstate = instantiate_chainstate(false, 0x80000000, function_name!());
12111211
let miner_1 =
1212-
StacksAddress::from_string(&"SP1A2K3ENNA6QQ7G8DVJXM24T6QMBDVS7D0TRTAR5".to_string())
1213-
.unwrap();
1212+
StacksAddress::from_string("SP1A2K3ENNA6QQ7G8DVJXM24T6QMBDVS7D0TRTAR5").unwrap();
12141213
let user_1 =
1215-
StacksAddress::from_string(&"SP2837ZMC89J40K4YTS64B00M7065C6X46JX6ARG0".to_string())
1216-
.unwrap();
1214+
StacksAddress::from_string("SP2837ZMC89J40K4YTS64B00M7065C6X46JX6ARG0").unwrap();
12171215
let mut miner_reward = make_dummy_miner_payment_schedule(&miner_1, 500, 0, 0, 1000, 1000);
12181216
let user_reward = make_dummy_user_payment_schedule(&user_1, 500, 0, 0, 750, 1000, 1);
12191217

@@ -1276,8 +1274,7 @@ mod test {
12761274
fn load_store_miner_payment_schedule() {
12771275
let mut chainstate = instantiate_chainstate(false, 0x80000000, function_name!());
12781276
let miner_1 =
1279-
StacksAddress::from_string(&"SP1A2K3ENNA6QQ7G8DVJXM24T6QMBDVS7D0TRTAR5".to_string())
1280-
.unwrap();
1277+
StacksAddress::from_string("SP1A2K3ENNA6QQ7G8DVJXM24T6QMBDVS7D0TRTAR5").unwrap();
12811278

12821279
let mut miner_reward = make_dummy_miner_payment_schedule(&miner_1, 500, 0, 0, 1000, 1000);
12831280

@@ -1322,8 +1319,7 @@ mod test {
13221319
fn load_store_miner_payment_schedule_pay_contract() {
13231320
let mut chainstate = instantiate_chainstate(false, 0x80000000, function_name!());
13241321
let miner_1 =
1325-
StacksAddress::from_string(&"SP1A2K3ENNA6QQ7G8DVJXM24T6QMBDVS7D0TRTAR5".to_string())
1326-
.unwrap();
1322+
StacksAddress::from_string("SP1A2K3ENNA6QQ7G8DVJXM24T6QMBDVS7D0TRTAR5").unwrap();
13271323

13281324
let mut miner_reward = make_dummy_miner_payment_schedule(&miner_1, 500, 0, 0, 1000, 1000);
13291325
miner_reward.recipient = PrincipalData::Contract(QualifiedContractIdentifier::transient());
@@ -1368,8 +1364,7 @@ mod test {
13681364
#[test]
13691365
fn miner_reward_one_miner_no_tx_fees_no_users() {
13701366
let miner_1 =
1371-
StacksAddress::from_string(&"SP1A2K3ENNA6QQ7G8DVJXM24T6QMBDVS7D0TRTAR5".to_string())
1372-
.unwrap();
1367+
StacksAddress::from_string("SP1A2K3ENNA6QQ7G8DVJXM24T6QMBDVS7D0TRTAR5").unwrap();
13731368
let participant = make_dummy_miner_payment_schedule(&miner_1, 500, 0, 0, 1000, 1000);
13741369

13751370
let (parent_reward, miner_reward) = StacksChainState::calculate_miner_reward(
@@ -1398,8 +1393,7 @@ mod test {
13981393
#[test]
13991394
fn miner_reward_one_miner_no_tx_fees_no_users_pay_contract() {
14001395
let miner_1 =
1401-
StacksAddress::from_string(&"SP1A2K3ENNA6QQ7G8DVJXM24T6QMBDVS7D0TRTAR5".to_string())
1402-
.unwrap();
1396+
StacksAddress::from_string("SP1A2K3ENNA6QQ7G8DVJXM24T6QMBDVS7D0TRTAR5").unwrap();
14031397
let mut participant = make_dummy_miner_payment_schedule(&miner_1, 500, 0, 0, 1000, 1000);
14041398
participant.recipient = PrincipalData::Contract(QualifiedContractIdentifier::transient());
14051399

@@ -1437,11 +1431,9 @@ mod test {
14371431
#[test]
14381432
fn miner_reward_one_miner_one_user_no_tx_fees() {
14391433
let miner_1 =
1440-
StacksAddress::from_string(&"SP1A2K3ENNA6QQ7G8DVJXM24T6QMBDVS7D0TRTAR5".to_string())
1441-
.unwrap();
1434+
StacksAddress::from_string("SP1A2K3ENNA6QQ7G8DVJXM24T6QMBDVS7D0TRTAR5").unwrap();
14421435
let user_1 =
1443-
StacksAddress::from_string(&"SP2837ZMC89J40K4YTS64B00M7065C6X46JX6ARG0".to_string())
1444-
.unwrap();
1436+
StacksAddress::from_string("SP2837ZMC89J40K4YTS64B00M7065C6X46JX6ARG0").unwrap();
14451437

14461438
let miner = make_dummy_miner_payment_schedule(&miner_1, 500, 0, 0, 250, 1000);
14471439
let user = make_dummy_user_payment_schedule(&user_1, 500, 0, 0, 750, 1000, 1);
@@ -1485,12 +1477,10 @@ mod test {
14851477
#[test]
14861478
fn miner_reward_tx_fees() {
14871479
let miner_1 =
1488-
StacksAddress::from_string(&"SP1A2K3ENNA6QQ7G8DVJXM24T6QMBDVS7D0TRTAR5".to_string())
1489-
.unwrap();
1480+
StacksAddress::from_string("SP1A2K3ENNA6QQ7G8DVJXM24T6QMBDVS7D0TRTAR5").unwrap();
14901481

14911482
let parent_miner_1 =
1492-
StacksAddress::from_string(&"SP2QDF700V0FWXVNQJJ4XFGBWE6R2Y4APTSFQNBVE".to_string())
1493-
.unwrap();
1483+
StacksAddress::from_string("SP2QDF700V0FWXVNQJJ4XFGBWE6R2Y4APTSFQNBVE").unwrap();
14941484

14951485
let participant = make_dummy_miner_payment_schedule(&miner_1, 500, 100, 105, 1000, 1000);
14961486
let parent_participant =

0 commit comments

Comments
 (0)