Skip to content

Commit 4a6bc74

Browse files
jferrantjferrant
committed
CRC: cleanup
Signed-off-by: Jacinta Ferrant <[email protected]>
1 parent 769c94d commit 4a6bc74

File tree

5 files changed

+39
-70
lines changed

5 files changed

+39
-70
lines changed

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

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

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,8 @@ impl TestMiner {
241241
);
242242
match self.vrf_key_map.get(vrf_pubkey) {
243243
Some(prover_key) => {
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-
) {
244+
let proof = VRF::prove(prover_key, last_sortition_hash.as_bytes());
245+
let valid = match VRF::verify(vrf_pubkey, &proof, last_sortition_hash.as_bytes()) {
250246
Ok(v) => v,
251247
Err(e) => false,
252248
};

‎stackslib/src/chainstate/stacks/index/test/marf.rs

Lines changed: 34 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ fn marf_insert_different_leaf_same_block_100() {
7777
merkle_test_marf(
7878
&mut marf.borrow_storage_backend(),
7979
&block_header,
80-
path_bytes.as_ref(),
81-
[99; 40].as_ref(),
80+
&path_bytes,
81+
&[99; 40],
8282
None,
8383
);
8484

@@ -151,8 +151,8 @@ fn marf_insert_different_leaf_different_path_different_block_100() {
151151
merkle_test_marf(
152152
&mut marf.borrow_storage_backend(),
153153
&block_header,
154-
path_bytes.as_ref(),
155-
[i; 40].as_ref(),
154+
&path_bytes,
155+
&[i; 40],
156156
None,
157157
);
158158
}
@@ -232,8 +232,8 @@ fn marf_insert_same_leaf_different_block_100() {
232232
merkle_test_marf(
233233
&mut marf.borrow_storage_backend(),
234234
&next_block_header,
235-
path_bytes.as_ref(),
236-
[i; 40].as_ref(),
235+
&path_bytes,
236+
&[i; 40],
237237
None,
238238
);
239239
}
@@ -312,8 +312,8 @@ fn marf_insert_leaf_sequence_2() {
312312
merkle_test_marf(
313313
&mut marf.borrow_storage_backend(),
314314
&last_block_header,
315-
path_bytes.as_ref(),
316-
[i; 40].as_ref(),
315+
&path_bytes,
316+
&[i; 40],
317317
None,
318318
);
319319
}
@@ -380,13 +380,7 @@ fn marf_insert_leaf_sequence_100() {
380380

381381
assert_eq!(leaf.data.to_vec(), [i; 40].to_vec());
382382

383-
merkle_test_marf(
384-
&mut f,
385-
&last_block_header,
386-
path_bytes.as_ref(),
387-
[i; 40].as_ref(),
388-
None,
389-
);
383+
merkle_test_marf(&mut f, &last_block_header, &path_bytes, &[i; 40], None);
390384
}
391385
if let Some(root_hashes) = last_root_hashes.take() {
392386
let next_root_hashes = f.read_root_to_block_table().unwrap();
@@ -615,16 +609,14 @@ where
615609
debug!("---------------------------------------");
616610
debug!(
617611
"MARF verify {:?} {:?} from current block header (immediate) {:?}",
618-
&prev_path,
619-
[j as u8; 40].as_ref(),
620-
&next_block_header
612+
&prev_path, &[j as u8; 40], &next_block_header
621613
);
622614
debug!("----------------------------------------");
623615
merkle_test_marf(
624616
&mut marf.borrow_storage_backend(),
625617
&next_block_header,
626-
prev_path.as_ref(),
627-
[j as u8; 40].as_ref(),
618+
&prev_path,
619+
&[j as u8; 40],
628620
None,
629621
);
630622
}
@@ -640,16 +632,14 @@ where
640632
debug!("---------------------------------------");
641633
debug!(
642634
"MARF verify {:?} {:?} from current block header (deferred) {:?}",
643-
&prev_path,
644-
[j as u8; 40].as_ref(),
645-
&next_block_header
635+
&prev_path, &[j as u8; 40], &next_block_header
646636
);
647637
debug!("----------------------------------------");
648638
merkle_test_marf(
649639
&mut marf.borrow_storage_backend(),
650640
&next_block_header,
651-
prev_path.as_ref(),
652-
[j as u8; 40].as_ref(),
641+
&prev_path,
642+
&[j as u8; 40],
653643
None,
654644
);
655645
}
@@ -662,8 +652,8 @@ where
662652
merkle_test_marf(
663653
&mut marf.borrow_storage_backend(),
664654
&next_block_header,
665-
next_path.as_ref(),
666-
[i as u8; 40].as_ref(),
655+
&next_path,
656+
&[i as u8; 40],
667657
None,
668658
);
669659
}
@@ -691,16 +681,14 @@ where
691681
debug!("---------------------------------------");
692682
debug!(
693683
"MARF verify {:?} {:?} from last block header {:?}",
694-
&next_path,
695-
[i as u8; 40].as_ref(),
696-
&last_block_header
684+
&next_path, &[i as u8; 40], &last_block_header
697685
);
698686
debug!("----------------------------------------");
699687
merkle_test_marf(
700688
&mut marf.borrow_storage_backend(),
701689
&last_block_header,
702-
next_path.as_ref(),
703-
[i as u8; 40].as_ref(),
690+
&next_path,
691+
&[i as u8; 40],
704692
None,
705693
);
706694
}
@@ -882,7 +870,7 @@ fn marf_merkle_verify_backptrs() {
882870
&mut marf.borrow_storage_backend(),
883871
&block_header_3,
884872
&path_3,
885-
[21; 40].as_ref(),
873+
&[21; 40],
886874
None,
887875
);
888876
if let Some(root_hashes) = last_root_hashes.take() {
@@ -957,7 +945,7 @@ where
957945
root_table_cache = Some(merkle_test_marf(
958946
&mut marf.borrow_storage_backend(),
959947
&block_header,
960-
path.as_ref(),
948+
&path,
961949
&value.data.to_vec(),
962950
root_table_cache,
963951
));
@@ -1018,7 +1006,7 @@ where
10181006
root_table_cache = Some(merkle_test_marf(
10191007
&mut marf.borrow_storage_backend(),
10201008
&block_header,
1021-
path.as_ref(),
1009+
&path,
10221010
&value.data.to_vec(),
10231011
root_table_cache,
10241012
));
@@ -1330,13 +1318,10 @@ fn marf_insert_random_10485760_4096_file_storage() {
13301318
seed = path.clone();
13311319

13321320
let key = to_hex(&path);
1333-
let value = to_hex(
1334-
[
1335-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1336-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, i0 as u8, i1 as u8, i2 as u8, i3 as u8,
1337-
]
1338-
.as_ref(),
1339-
);
1321+
let value = to_hex(&[
1322+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1323+
0, 0, 0, 0, 0, 0, 0, 0, i0 as u8, i1 as u8, i2 as u8, i3 as u8,
1324+
]);
13401325

13411326
keys.push(key);
13421327
values.push(value);
@@ -1388,13 +1373,10 @@ fn marf_insert_random_10485760_4096_file_storage() {
13881373
seed = path.clone();
13891374

13901375
let key = to_hex(&path);
1391-
let value = to_hex(
1392-
[
1393-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1394-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, i0 as u8, i1 as u8, i2 as u8, i3 as u8,
1395-
]
1396-
.as_ref(),
1397-
);
1376+
let value = to_hex(&[
1377+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1378+
0, 0, 0, 0, 0, 0, 0, 0, i0 as u8, i1 as u8, i2 as u8, i3 as u8,
1379+
]);
13981380

13991381
keys.push(key);
14001382
values.push(value);
@@ -1618,13 +1600,7 @@ fn marf_read_random_1048576_4096_file_storage() {
16181600

16191601
// can make a merkle proof to each one
16201602
if do_merkle_check {
1621-
merkle_test_marf(
1622-
&mut f,
1623-
&block_header,
1624-
path.as_ref(),
1625-
&value.data.to_vec(),
1626-
None,
1627-
);
1603+
merkle_test_marf(&mut f, &block_header, &path, &value.data.to_vec(), None);
16281604
}
16291605
if i % 128 == 0 {
16301606
let end_time = get_epoch_time_ms();
@@ -1927,7 +1903,7 @@ fn marf_insert_flush_to_different_block() {
19271903
root_table_cache = Some(merkle_test_marf(
19281904
&mut marf.borrow_storage_backend(),
19291905
&target_block,
1930-
path.as_ref(),
1906+
&path,
19311907
&value.data.to_vec(),
19321908
root_table_cache,
19331909
));
@@ -2047,7 +2023,7 @@ fn marf_insert_flush_to_different_block() {
20472023
root_table_cache = Some(merkle_test_marf(
20482024
&mut marf.borrow_storage_backend(),
20492025
&read_from_block,
2050-
path.as_ref(),
2026+
&path,
20512027
&value.data.to_vec(),
20522028
root_table_cache,
20532029
));

‎stackslib/src/chainstate/stacks/index/test/node.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4251,10 +4251,7 @@ fn trie_cursor_walk_full() {
42514251

42524252
let (ptr, node, hash) = fields_opt.unwrap();
42534253
assert_eq!(ptr, node_ptrs[31]);
4254-
assert_eq!(
4255-
node,
4256-
TrieNodeType::Leaf(TrieLeaf::new(&[], [31u8; 40].as_ref()))
4257-
);
4254+
assert_eq!(node, TrieNodeType::Leaf(TrieLeaf::new(&[], &[31u8; 40])));
42584255
assert_eq!(hash, hashes[31]);
42594256

42604257
// cursor's last-visited node points at the penultimate node (the last node4),

‎testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2301,7 +2301,7 @@ pub struct SerializedTx {
23012301

23022302
impl SerializedTx {
23032303
pub fn new(tx: Transaction) -> SerializedTx {
2304-
let txid = Txid::from_vec_be(tx.txid().as_bytes().as_ref()).unwrap();
2304+
let txid = Txid::from_vec_be(tx.txid().as_bytes()).unwrap();
23052305
let mut encoder = RawEncoder::new(Cursor::new(vec![]));
23062306
tx.consensus_encode(&mut encoder)
23072307
.expect("BUG: failed to serialize to a vec");

0 commit comments

Comments
 (0)