Skip to content

Commit 767dd7e

Browse files
jferrantjferrant
committed
CRC: cleanup
Signed-off-by: Jacinta Ferrant <[email protected]>
1 parent 3e01ab9 commit 767dd7e

File tree

17 files changed

+42
-40
lines changed

17 files changed

+42
-40
lines changed

‎libsigner/src/v0/messages.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,7 @@ mod test {
12371237
txs: vec![],
12381238
};
12391239
let tx_merkle_root = {
1240-
let txid_vecs = block
1240+
let txid_vecs: Vec<_> = block
12411241
.txs
12421242
.iter()
12431243
.map(|tx| tx.txid().as_bytes().to_vec())

‎stacks-common/src/types/chainstate.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ impl TrieHash {
7878
}
7979

8080
/// Convert to a String that can be used in e.g. sqlite
81+
/// If we did not implement this seperate from Display,
82+
/// we would use the stacks_common::util::hash::to_hex function
83+
/// which is the unrolled version of this function.
8184
#[allow(clippy::inherent_to_string_shadow_display)]
8285
pub fn to_string(&self) -> String {
8386
let s = format!("{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}",

‎stacks-common/src/types/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ impl CoinbaseInterval {
260260
}
261261

262262
let mut ht = intervals[0].effective_start_height;
263-
for interval in intervals {
263+
for interval in intervals.iter().skip(1) {
264264
if interval.effective_start_height < ht {
265265
return false;
266266
}

‎stacks-common/src/util/hash.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,6 @@ pub type MerklePath<H> = Vec<MerklePathPoint<H>>;
390390
///
391391
/// NOTE: This is consensus-critical code, because it is used to generate the transaction Merkle
392392
/// tree roots in Stacks blocks.
393-
#[allow(clippy::ptr_arg)]
394393
impl<H> MerkleTree<H>
395394
where
396395
H: MerkleHashFunc + Clone + PartialEq + fmt::Debug,
@@ -399,7 +398,7 @@ where
399398
MerkleTree { nodes: vec![] }
400399
}
401400

402-
pub fn new(data: &Vec<Vec<u8>>) -> MerkleTree<H> {
401+
pub fn new(data: &[Vec<u8>]) -> MerkleTree<H> {
403402
if data.is_empty() {
404403
return MerkleTree { nodes: vec![] };
405404
}

‎stacks-signer/src/client/stackerdb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ mod tests {
270270
txs: vec![],
271271
};
272272
let tx_merkle_root = {
273-
let txid_vecs = block
273+
let txid_vecs: Vec<_> = block
274274
.txs
275275
.iter()
276276
.map(|tx| tx.txid().as_bytes().to_vec())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ impl NakamotoBlockBuilder {
464464
/// Returns the unsigned Nakamoto block
465465
fn finalize_block(&mut self, clarity_tx: &mut ClarityTx) -> NakamotoBlock {
466466
// done! Calculate state root and tx merkle root
467-
let txid_vecs = self
467+
let txid_vecs: Vec<_> = self
468468
.txs
469469
.iter()
470470
.map(|tx| tx.txid().as_bytes().to_vec())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4987,7 +4987,7 @@ impl StacksMessageCodec for NakamotoBlock {
49874987
}
49884988

49894989
// header and transactions must be consistent
4990-
let txid_vecs = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
4990+
let txid_vecs: Vec<_> = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
49914991

49924992
let merkle_tree = MerkleTree::new(&txid_vecs);
49934993
let tx_merkle_root: Sha512Trunc256Sum = merkle_tree.root();

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ pub fn test_load_store_update_nakamoto_blocks() {
616616

617617
let epoch2_txs = vec![coinbase_tx.clone()];
618618
let epoch2_tx_merkle_root = {
619-
let txid_vecs = epoch2_txs
619+
let txid_vecs: Vec<_> = epoch2_txs
620620
.iter()
621621
.map(|tx| tx.txid().as_bytes().to_vec())
622622
.collect();
@@ -710,7 +710,7 @@ pub fn test_load_store_update_nakamoto_blocks() {
710710

711711
let nakamoto_txs = vec![tenure_change_tx.clone(), coinbase_tx.clone()];
712712
let nakamoto_tx_merkle_root = {
713-
let txid_vecs = nakamoto_txs
713+
let txid_vecs: Vec<_> = nakamoto_txs
714714
.iter()
715715
.map(|tx| tx.txid().as_bytes().to_vec())
716716
.collect();
@@ -720,7 +720,7 @@ pub fn test_load_store_update_nakamoto_blocks() {
720720

721721
let nakamoto_txs_2 = vec![stx_transfer_tx.clone()];
722722
let nakamoto_tx_merkle_root_2 = {
723-
let txid_vecs = nakamoto_txs_2
723+
let txid_vecs: Vec<_> = nakamoto_txs_2
724724
.iter()
725725
.map(|tx| tx.txid().as_bytes().to_vec())
726726
.collect();
@@ -730,7 +730,7 @@ pub fn test_load_store_update_nakamoto_blocks() {
730730

731731
let nakamoto_txs_3 = vec![stx_transfer_tx_3.clone()];
732732
let nakamoto_tx_merkle_root_3 = {
733-
let txid_vecs = nakamoto_txs_3
733+
let txid_vecs: Vec<_> = nakamoto_txs_3
734734
.iter()
735735
.map(|tx| tx.txid().as_bytes().to_vec())
736736
.collect();
@@ -740,7 +740,7 @@ pub fn test_load_store_update_nakamoto_blocks() {
740740

741741
let nakamoto_txs_4 = vec![stx_transfer_tx_4.clone()];
742742
let nakamoto_tx_merkle_root_4 = {
743-
let txid_vecs = nakamoto_txs_4
743+
let txid_vecs: Vec<_> = nakamoto_txs_4
744744
.iter()
745745
.map(|tx| tx.txid().as_bytes().to_vec())
746746
.collect();
@@ -1780,7 +1780,7 @@ fn test_nakamoto_block_static_verification() {
17801780

17811781
let nakamoto_txs = vec![tenure_change_tx.clone(), coinbase_tx.clone()];
17821782
let nakamoto_tx_merkle_root = {
1783-
let txid_vecs = nakamoto_txs
1783+
let txid_vecs: Vec<_> = nakamoto_txs
17841784
.iter()
17851785
.map(|tx| tx.txid().as_bytes().to_vec())
17861786
.collect();
@@ -1790,7 +1790,7 @@ fn test_nakamoto_block_static_verification() {
17901790

17911791
let nakamoto_recipient_txs = vec![tenure_change_tx.clone(), coinbase_recipient_tx.clone()];
17921792
let nakamoto_recipient_tx_merkle_root = {
1793-
let txid_vecs = nakamoto_recipient_txs
1793+
let txid_vecs: Vec<_> = nakamoto_recipient_txs
17941794
.iter()
17951795
.map(|tx| tx.txid().as_bytes().to_vec())
17961796
.collect();
@@ -1803,7 +1803,7 @@ fn test_nakamoto_block_static_verification() {
18031803
coinbase_shadow_recipient_tx.clone(),
18041804
];
18051805
let nakamoto_shadow_recipient_tx_merkle_root = {
1806-
let txid_vecs = nakamoto_shadow_recipient_txs
1806+
let txid_vecs: Vec<_> = nakamoto_shadow_recipient_txs
18071807
.iter()
18081808
.map(|tx| tx.txid().as_bytes().to_vec())
18091809
.collect();
@@ -1813,7 +1813,7 @@ fn test_nakamoto_block_static_verification() {
18131813

18141814
let nakamoto_txs_bad_ch = vec![tenure_change_tx_bad_ch.clone(), coinbase_tx.clone()];
18151815
let nakamoto_tx_merkle_root_bad_ch = {
1816-
let txid_vecs = nakamoto_txs_bad_ch
1816+
let txid_vecs: Vec<_> = nakamoto_txs_bad_ch
18171817
.iter()
18181818
.map(|tx| tx.txid().as_bytes().to_vec())
18191819
.collect();
@@ -1824,7 +1824,7 @@ fn test_nakamoto_block_static_verification() {
18241824
let nakamoto_txs_bad_miner_sig =
18251825
vec![tenure_change_tx_bad_miner_sig.clone(), coinbase_tx.clone()];
18261826
let nakamoto_tx_merkle_root_bad_miner_sig = {
1827-
let txid_vecs = nakamoto_txs_bad_miner_sig
1827+
let txid_vecs: Vec<_> = nakamoto_txs_bad_miner_sig
18281828
.iter()
18291829
.map(|tx| tx.txid().as_bytes().to_vec())
18301830
.collect();

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ impl StacksMessageCodec for StacksBlock {
338338
}
339339

340340
// header and transactions must be consistent
341-
let txid_vecs = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
341+
let txid_vecs: Vec<_> = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
342342

343343
let merkle_tree = MerkleTree::<Sha512Trunc256Sum>::new(&txid_vecs);
344344
let tx_merkle_root = merkle_tree.root();
@@ -388,7 +388,7 @@ impl StacksBlock {
388388
state_index_root: &TrieHash,
389389
microblock_pubkey_hash: &Hash160,
390390
) -> StacksBlock {
391-
let txids = txs
391+
let txids: Vec<_> = txs
392392
.iter()
393393
.map(|ref tx| tx.txid().as_bytes().to_vec())
394394
.collect();
@@ -853,7 +853,7 @@ impl StacksMessageCodec for StacksMicroblock {
853853
}
854854

855855
// header and transactions must be consistent
856-
let txid_vecs = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
856+
let txid_vecs: Vec<_> = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
857857

858858
let merkle_tree = MerkleTree::<Sha512Trunc256Sum>::new(&txid_vecs);
859859
let tx_merkle_root = merkle_tree.root();
@@ -880,7 +880,7 @@ impl StacksMicroblock {
880880
parent_block_hash: &BlockHeaderHash,
881881
txs: Vec<StacksTransaction>,
882882
) -> StacksMicroblock {
883-
let txids = txs
883+
let txids: Vec<_> = txs
884884
.iter()
885885
.map(|ref tx| tx.txid().as_bytes().to_vec())
886886
.collect();
@@ -897,7 +897,7 @@ impl StacksMicroblock {
897897
parent_header: &StacksMicroblockHeader,
898898
txs: Vec<StacksTransaction>,
899899
) -> Option<StacksMicroblock> {
900-
let txids = txs
900+
let txids: Vec<_> = txs
901901
.iter()
902902
.map(|ref tx| tx.txid().as_bytes().to_vec())
903903
.collect();
@@ -1173,7 +1173,7 @@ mod test {
11731173
all_txs[3 * i + 2].clone(),
11741174
];
11751175

1176-
let txid_vecs = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
1176+
let txid_vecs: Vec<_> = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
11771177

11781178
let merkle_tree = MerkleTree::<Sha512Trunc256Sum>::new(&txid_vecs);
11791179
let tx_merkle_root = merkle_tree.root();
@@ -1501,7 +1501,7 @@ mod test {
15011501
let txs_dup = vec![tx_coinbase.clone(), tx_dup.clone(), tx_dup.clone()];
15021502

15031503
let get_tx_root = |txs: &Vec<StacksTransaction>| {
1504-
let txid_vecs = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
1504+
let txid_vecs: Vec<_> = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
15051505

15061506
let merkle_tree = MerkleTree::<Sha512Trunc256Sum>::new(&txid_vecs);
15071507
let tx_merkle_root = merkle_tree.root();
@@ -1628,7 +1628,7 @@ mod test {
16281628
let txs_dup = vec![tx_dup.clone(), tx_dup.clone()];
16291629

16301630
let get_tx_root = |txs: &Vec<StacksTransaction>| {
1631-
let txid_vecs = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
1631+
let txid_vecs: Vec<_> = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
16321632

16331633
let merkle_tree = MerkleTree::<Sha512Trunc256Sum>::new(&txid_vecs);
16341634
let tx_merkle_root = merkle_tree.root();
@@ -1718,7 +1718,7 @@ mod test {
17181718
StacksEpochId::Epoch30,
17191719
];
17201720
let get_tx_root = |txs: &Vec<StacksTransaction>| {
1721-
let txid_vecs = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
1721+
let txid_vecs: Vec<_> = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
17221722

17231723
let merkle_tree = MerkleTree::<Sha512Trunc256Sum>::new(&txid_vecs);
17241724
let tx_merkle_root = merkle_tree.root();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7165,7 +7165,7 @@ pub mod test {
71657165
all_txs[3 * i + 2].clone(),
71667166
];
71677167

7168-
let txid_vecs = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
7168+
let txid_vecs: Vec<_> = txs.iter().map(|tx| tx.txid().as_bytes().to_vec()).collect();
71697169

71707170
let merkle_tree = MerkleTree::<Sha512Trunc256Sum>::new(&txid_vecs);
71717171
let tx_merkle_root = merkle_tree.root();
@@ -8846,7 +8846,7 @@ pub mod test {
88468846

88478847
conflicting_microblock.txs.push(extra_tx);
88488848

8849-
let txid_vecs = conflicting_microblock
8849+
let txid_vecs: Vec<_> = conflicting_microblock
88508850
.txs
88518851
.iter()
88528852
.map(|tx| tx.txid().as_bytes().to_vec())

0 commit comments

Comments
 (0)