Fix unused_unit clippy warnings in stackslib

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

stackslib/src/burnchains/bitcoin/spv.rs

@@ -358,7 +358,7 @@ impl SpvClient {
     }
 
     /// Get the block range to scan
-    pub fn set_scan_range(&mut self, start_block: u64, end_block: Option<u64>) -> () {
+    pub fn set_scan_range(&mut self, start_block: u64, end_block: Option<u64>) {
         self.start_block_height = start_block;
         self.end_block_height = end_block;
         self.cur_block_height = start_block;

stackslib/src/burnchains/db.rs

@@ -144,7 +144,7 @@ impl FromRow<BlockCommitMetadata> for BlockCommitMetadata {
 pub(crate) fn apply_blockstack_txs_safety_checks(
     block_height: u64,
     blockstack_txs: &mut Vec<BlockstackOperationType>,
-) -> () {
+) {
     test_debug!(
         "Apply safety checks on {} txs at burnchain height {}",
         blockstack_txs.len(),

stackslib/src/burnchains/tests/mod.rs

@@ -279,11 +279,11 @@ impl TestMiner {
         self.nonce
     }
 
-    pub fn set_nonce(&mut self, n: u64) -> () {
+    pub fn set_nonce(&mut self, n: u64) {
         self.nonce = n;
     }
 
-    pub fn sign_as_origin(&mut self, tx_signer: &mut StacksTransactionSigner) -> () {
+    pub fn sign_as_origin(&mut self, tx_signer: &mut StacksTransactionSigner) {
         let num_keys = if self.privks.len() < self.num_sigs as usize {
             self.privks.len()
         } else {
@@ -297,7 +297,7 @@ impl TestMiner {
         self.nonce += 1
     }
 
-    pub fn sign_as_sponsor(&mut self, tx_signer: &mut StacksTransactionSigner) -> () {
+    pub fn sign_as_sponsor(&mut self, tx_signer: &mut StacksTransactionSigner) {
         let num_keys = if self.privks.len() < self.num_sigs as usize {
             self.privks.len()
         } else {
@@ -576,7 +576,7 @@ impl TestBurnchainBlock {
         )
     }
 
-    pub fn patch_from_chain_tip(&mut self, parent_snapshot: &BlockSnapshot) -> () {
+    pub fn patch_from_chain_tip(&mut self, parent_snapshot: &BlockSnapshot) {
         assert_eq!(parent_snapshot.block_height + 1, self.block_height);
 
         for i in 0..self.txs.len() {
@@ -734,7 +734,7 @@ impl TestBurnchainFork {
         new_fork
     }
 
-    pub fn append_block(&mut self, b: TestBurnchainBlock) -> () {
+    pub fn append_block(&mut self, b: TestBurnchainBlock) {
         self.pending_blocks.push(b);
     }
 
@@ -894,7 +894,7 @@ fn process_next_sortition(
     (tip_snapshot, next_prev_keys, next_commits)
 }
 
-fn verify_keys_accepted(node: &mut TestBurnchainNode, prev_keys: &Vec<LeaderKeyRegisterOp>) -> () {
+fn verify_keys_accepted(node: &mut TestBurnchainNode, prev_keys: &Vec<LeaderKeyRegisterOp>) {
     // all keys accepted
     for key in prev_keys.iter() {
         let tx_opt = SortitionDB::get_burnchain_transaction(node.sortdb.conn(), &key.txid).unwrap();
@@ -915,7 +915,7 @@ fn verify_keys_accepted(node: &mut TestBurnchainNode, prev_keys: &Vec<LeaderKeyR
 fn verify_commits_accepted(
     node: &TestBurnchainNode,
     next_block_commits: &Vec<LeaderBlockCommitOp>,
-) -> () {
+) {
     // all commits accepted
     for commit in next_block_commits.iter() {
         let tx_opt =

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

@@ -4120,8 +4120,8 @@ impl SortitionDB {
         mut after: G,
     ) -> Result<(), BurnchainError>
     where
-        F: FnMut(&mut SortitionDBTx, &BurnchainHeaderHash, &Vec<BurnchainHeaderHash>) -> (),
-        G: FnMut(&mut SortitionDBTx) -> (),
+        F: FnMut(&mut SortitionDBTx, &BurnchainHeaderHash, &Vec<BurnchainHeaderHash>),
+        G: FnMut(&mut SortitionDBTx),
     {
         let mut db_tx = self.tx_begin()?;
         let mut queue = vec![burn_block.clone()];
@@ -4287,7 +4287,7 @@ impl SortitionDB {
     /// * `next_pox_info` - iff this sortition is the first block in a reward cycle, this should be Some
     /// * `announce_to` - a function that will be invoked with the calculated reward set before this method
     ///                   commits its results. This is used to post the calculated reward set to an event observer.
-    pub fn evaluate_sortition<F: FnOnce(Option<RewardSetInfo>) -> ()>(
+    pub fn evaluate_sortition<F: FnOnce(Option<RewardSetInfo>)>(
         &mut self,
         mainnet: bool,
         burn_header: &BurnchainBlockHeader,
@@ -5238,7 +5238,7 @@ impl SortitionDB {
     pub fn merge_block_header_cache(
         cache: &mut BlockHeaderCache,
         header_data: &Vec<(ConsensusHash, Option<BlockHeaderHash>)>,
-    ) -> () {
+    ) {
         if header_data.len() > 0 {
             let mut i = header_data.len() - 1;
             while i > 0 {

stackslib/src/chainstate/burn/distribution.rs

@@ -365,7 +365,7 @@ impl BurnSamplePoint {
 
     /// Calculate the ranges between 0 and 2**256 - 1 over which each point in the burn sample
     /// applies, so we can later select which block to use.
-    fn make_sortition_ranges(burn_sample: &mut Vec<BurnSamplePoint>) -> () {
+    fn make_sortition_ranges(burn_sample: &mut Vec<BurnSamplePoint>) {
         if burn_sample.len() == 0 {
             // empty sample
             return;

stackslib/src/chainstate/stacks/auth.rs

@@ -207,12 +207,12 @@ impl MultisigSpendingCondition {
         &mut self,
         key_encoding: TransactionPublicKeyEncoding,
         signature: MessageSignature,
-    ) -> () {
+    ) {
         self.fields
             .push(TransactionAuthField::Signature(key_encoding, signature));
     }
 
-    pub fn push_public_key(&mut self, public_key: StacksPublicKey) -> () {
+    pub fn push_public_key(&mut self, public_key: StacksPublicKey) {
         self.fields
             .push(TransactionAuthField::PublicKey(public_key));
     }
@@ -406,12 +406,12 @@ impl OrderIndependentMultisigSpendingCondition {
         &mut self,
         key_encoding: TransactionPublicKeyEncoding,
         signature: MessageSignature,
-    ) -> () {
+    ) {
         self.fields
             .push(TransactionAuthField::Signature(key_encoding, signature));
     }
 
-    pub fn push_public_key(&mut self, public_key: StacksPublicKey) -> () {
+    pub fn push_public_key(&mut self, public_key: StacksPublicKey) {
         self.fields
             .push(TransactionAuthField::PublicKey(public_key));
     }
@@ -569,7 +569,7 @@ impl StacksMessageCodec for SinglesigSpendingCondition {
 }
 
 impl SinglesigSpendingCondition {
-    pub fn set_signature(&mut self, signature: MessageSignature) -> () {
+    pub fn set_signature(&mut self, signature: MessageSignature) {
         self.signature = signature;
     }
 
@@ -908,7 +908,7 @@ impl TransactionSpendingCondition {
         }
     }
 
-    pub fn set_nonce(&mut self, n: u64) -> () {
+    pub fn set_nonce(&mut self, n: u64) {
         match *self {
             TransactionSpendingCondition::Singlesig(ref mut singlesig_data) => {
                 singlesig_data.nonce = n;
@@ -922,7 +922,7 @@ impl TransactionSpendingCondition {
         }
     }
 
-    pub fn set_tx_fee(&mut self, tx_fee: u64) -> () {
+    pub fn set_tx_fee(&mut self, tx_fee: u64) {
         match *self {
             TransactionSpendingCondition::Singlesig(ref mut singlesig_data) => {
                 singlesig_data.tx_fee = tx_fee;
@@ -978,7 +978,7 @@ impl TransactionSpendingCondition {
     }
 
     /// Clear fee rate, nonces, signatures, and public keys
-    pub fn clear(&mut self) -> () {
+    pub fn clear(&mut self) {
         match *self {
             TransactionSpendingCondition::Singlesig(ref mut singlesig_data) => {
                 singlesig_data.tx_fee = 0;
@@ -1309,7 +1309,7 @@ impl TransactionAuth {
         self.origin().nonce()
     }
 
-    pub fn set_origin_nonce(&mut self, n: u64) -> () {
+    pub fn set_origin_nonce(&mut self, n: u64) {
         match *self {
             TransactionAuth::Standard(ref mut s) => s.set_nonce(n),
             TransactionAuth::Sponsored(ref mut s, _) => s.set_nonce(n),
@@ -1340,7 +1340,7 @@ impl TransactionAuth {
         }
     }
 
-    pub fn set_tx_fee(&mut self, tx_fee: u64) -> () {
+    pub fn set_tx_fee(&mut self, tx_fee: u64) {
         match *self {
             TransactionAuth::Standard(ref mut s) => s.set_tx_fee(tx_fee),
             TransactionAuth::Sponsored(_, ref mut s) => s.set_tx_fee(tx_fee),
@@ -1376,7 +1376,7 @@ impl TransactionAuth {
     }
 
     /// Clear out all transaction auth fields, nonces, and fee rates from the spending condition(s).
-    pub fn clear(&mut self) -> () {
+    pub fn clear(&mut self) {
         match *self {
             TransactionAuth::Standard(ref mut origin_condition) => {
                 origin_condition.clear();

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

@@ -678,7 +678,7 @@ impl StacksChainState {
         blocks_dir: &str,
         consensus_hash: &ConsensusHash,
         block_header_hash: &BlockHeaderHash,
-    ) -> () {
+    ) {
         let block_path =
             StacksChainState::make_block_dir(blocks_dir, consensus_hash, &block_header_hash)
                 .expect("FATAL: failed to create block directory");
@@ -737,7 +737,7 @@ impl StacksChainState {
         blocks_path: &str,
         consensus_hash: &ConsensusHash,
         block_header: &StacksBlockHeader,
-    ) -> () {
+    ) {
         StacksChainState::free_block(blocks_path, consensus_hash, &block_header.block_hash())
     }
 
@@ -7223,7 +7223,7 @@ pub mod test {
         chainstate: &mut StacksChainState,
         consensus_hash: &ConsensusHash,
         block: &StacksBlock,
-    ) -> () {
+    ) {
         assert!(StacksChainState::load_staging_block_data(
             &chainstate.db(),
             &chainstate.blocks_path,
@@ -7266,7 +7266,7 @@ pub mod test {
         chainstate: &mut StacksChainState,
         consensus_hash: &ConsensusHash,
         block: &StacksBlock,
-    ) -> () {
+    ) {
         assert!(!StacksChainState::has_stored_block(
             &chainstate.db(),
             &chainstate.blocks_path,
@@ -7290,7 +7290,7 @@ pub mod test {
         chainstate: &mut StacksChainState,
         consensus_hash: &ConsensusHash,
         block: &StacksBlock,
-    ) -> () {
+    ) {
         assert!(StacksChainState::has_stored_block(
             &chainstate.db(),
             &chainstate.blocks_path,
@@ -7351,7 +7351,7 @@ pub mod test {
         chainstate: &mut StacksChainState,
         consensus_hash: &ConsensusHash,
         block: &StacksBlock,
-    ) -> () {
+    ) {
         assert!(StacksChainState::has_stored_block(
             &chainstate.db(),
             &chainstate.blocks_path,

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

@@ -546,7 +546,7 @@ impl<'a, 'b> ClarityTx<'a, 'b> {
     }
 
     #[cfg(test)]
-    pub fn commit_block(self) -> () {
+    pub fn commit_block(self) {
         self.block.commit_block();
     }
 
@@ -557,11 +557,7 @@ impl<'a, 'b> ClarityTx<'a, 'b> {
         Ok(self.block.commit_mined_block(block_hash)?.get_total())
     }
 
-    pub fn commit_to_block(
-        self,
-        consensus_hash: &ConsensusHash,
-        block_hash: &BlockHeaderHash,
-    ) -> () {
+    pub fn commit_to_block(self, consensus_hash: &ConsensusHash, block_hash: &BlockHeaderHash) {
         let index_block_hash = StacksBlockHeader::make_index_block_hash(consensus_hash, block_hash);
         self.block.commit_to_block(&index_block_hash);
     }
@@ -575,19 +571,19 @@ impl<'a, 'b> ClarityTx<'a, 'b> {
         self.block.precommit_to_block(index_block_hash)
     }
 
-    pub fn commit_unconfirmed(self) -> () {
+    pub fn commit_unconfirmed(self) {
         self.block.commit_unconfirmed();
     }
 
-    pub fn rollback_block(self) -> () {
+    pub fn rollback_block(self) {
         self.block.rollback_block()
     }
 
-    pub fn rollback_unconfirmed(self) -> () {
+    pub fn rollback_unconfirmed(self) {
         self.block.rollback_unconfirmed()
     }
 
-    pub fn reset_cost(&mut self, cost: ExecutionCost) -> () {
+    pub fn reset_cost(&mut self, cost: ExecutionCost) {
         self.block.reset_block_cost(cost);
     }
 
@@ -959,7 +955,7 @@ pub struct ChainStateBootData {
     pub first_burnchain_block_timestamp: u32,
     pub initial_balances: Vec<(PrincipalData, u64)>,
     pub pox_constants: PoxConstants,
-    pub post_flight_callback: Option<Box<dyn FnOnce(&mut ClarityTx) -> ()>>,
+    pub post_flight_callback: Option<Box<dyn FnOnce(&mut ClarityTx)>>,
     pub get_bulk_initial_lockups:
         Option<Box<dyn FnOnce() -> Box<dyn Iterator<Item = ChainstateAccountLockup>>>>,
     pub get_bulk_initial_balances:
@@ -974,7 +970,7 @@ impl ChainStateBootData {
     pub fn new(
         burnchain: &Burnchain,
         initial_balances: Vec<(PrincipalData, u64)>,
-        post_flight_callback: Option<Box<dyn FnOnce(&mut ClarityTx) -> ()>>,
+        post_flight_callback: Option<Box<dyn FnOnce(&mut ClarityTx)>>,
     ) -> ChainStateBootData {
         ChainStateBootData {
             first_burnchain_block_hash: burnchain.first_block_hash.clone(),

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

@@ -683,7 +683,7 @@ impl<T: MarfTrieId> MARF<T> {
         }
     }
 
-    fn node_copy_update_ptrs(ptrs: &mut [TriePtr], child_block_id: u32) -> () {
+    fn node_copy_update_ptrs(ptrs: &mut [TriePtr], child_block_id: u32) {
         for pointer in ptrs.iter_mut() {
             // if the node is empty, do nothing, if it's a back pointer,
             if pointer.id() == TrieNodeID::Empty as u8 || is_backptr(pointer.id()) {

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

@@ -495,7 +495,7 @@ impl<T: MarfTrieId> TrieCursor<T> {
     /// Replace the last-visited node and ptr within this trie.  Used when doing a copy-on-write or
     /// promoting a node, so the cursor state accurately reflects the nodes and tries visited.
     #[inline]
-    pub fn repair_retarget(&mut self, node: &TrieNodeType, ptr: &TriePtr, hash: &T) -> () {
+    pub fn repair_retarget(&mut self, node: &TrieNodeType, ptr: &TriePtr, hash: &T) {
         // this can only be called if we failed to walk to a node (this method _should not_ be
         // called if we walked to a backptr).
         if Some(CursorError::ChrNotFound) != self.last_error
@@ -526,7 +526,7 @@ impl<T: MarfTrieId> TrieCursor<T> {
         next_node: &TrieNodeType,
         ptr: &TriePtr,
         block_hash: T,
-    ) -> () {
+    ) {
         // this can only be called if we walked to a backptr.
         // If it's anything else, we're in trouble.
         if Some(CursorError::ChrNotFound) == self.last_error
@@ -553,7 +553,7 @@ impl<T: MarfTrieId> TrieCursor<T> {
     /// Record that we landed on a non-backptr from a backptr.
     /// ptr is a non-backptr that refers to the node we landed on.
     #[inline]
-    pub fn repair_backptr_finish(&mut self, ptr: &TriePtr, block_hash: T) -> () {
+    pub fn repair_backptr_finish(&mut self, ptr: &TriePtr, block_hash: T) {
         // this can only be called if we walked to a backptr.
         // If it's anything else, we're in trouble.
         if Some(CursorError::ChrNotFound) == self.last_error
@@ -1334,7 +1334,7 @@ impl TrieNodeType {
         with_node!(self, ref data, &data.path)
     }
 
-    pub fn set_path(&mut self, new_path: Vec<u8>) -> () {
+    pub fn set_path(&mut self, new_path: Vec<u8>) {
         with_node!(self, ref mut data, data.path = new_path)
     }
 }