chore: cargo fmt

jcnelson · jcnelson · commit 4a7f9e982307 · 2024-11-08T15:10:49.000-05:00
diff --git a/clarity/src/vm/database/clarity_db.rs b/clarity/src/vm/database/clarity_db.rs
@@ -23,10 +23,9 @@ use stacks_common::consts::{
 };
 use stacks_common::types::chainstate::{
     BlockHeaderHash, BurnchainHeaderHash, ConsensusHash, SortitionId, StacksAddress, StacksBlockId,
-    VRFSeed,
+    TrieHash, VRFSeed,
 };
 use stacks_common::types::{Address, StacksEpoch as GenericStacksEpoch, StacksEpochId};
-use stacks_common::types::chainstate::TrieHash;
 use stacks_common::util::hash::{to_hex, Hash160, Sha256Sum, Sha512Trunc256Sum};
 
 use super::clarity_store::SpecialCaseHandler;
@@ -465,7 +464,7 @@ impl<'a> ClarityDatabase<'a> {
     {
         self.store.get_data::<T>(key)
     }
-    
+
     pub fn get_data_by_hash<T>(&mut self, hash: &TrieHash) -> Result<Option<T>>
     where
         T: ClarityDeserializable<T>,
@@ -529,8 +528,11 @@ impl<'a> ClarityDatabase<'a> {
     {
         self.store.get_data_with_proof(key)
     }
-    
-    pub fn get_data_with_proof_by_hash<T>(&mut self, hash: &TrieHash) -> Result<Option<(T, Vec<u8>)>>
+
+    pub fn get_data_with_proof_by_hash<T>(
+        &mut self,
+        hash: &TrieHash,
+    ) -> Result<Option<(T, Vec<u8>)>>
     where
         T: ClarityDeserializable<T>,
     {
diff --git a/clarity/src/vm/database/clarity_store.rs b/clarity/src/vm/database/clarity_store.rs
@@ -214,7 +214,7 @@ impl ClarityBackingStore for NullBackingStore {
     fn get_data(&mut self, _key: &str) -> Result<Option<String>> {
         panic!("NullBackingStore can't retrieve data")
     }
-    
+
     fn get_data_from_path(&mut self, _hash: &TrieHash) -> Result<Option<String>> {
         panic!("NullBackingStore can't retrieve data")
     }
diff --git a/clarity/src/vm/database/key_value_wrapper.rs b/clarity/src/vm/database/key_value_wrapper.rs
@@ -17,8 +17,7 @@
 use std::hash::Hash;
 
 use hashbrown::HashMap;
-use stacks_common::types::chainstate::StacksBlockId;
-use stacks_common::types::chainstate::TrieHash;
+use stacks_common::types::chainstate::{StacksBlockId, TrieHash};
 use stacks_common::types::StacksEpochId;
 use stacks_common::util::hash::Sha512Trunc256Sum;
 
@@ -369,10 +368,13 @@ impl<'a> RollbackWrapper<'a> {
             .map(|(value, proof)| Ok((T::deserialize(&value)?, proof)))
             .transpose()
     }
-    
+
     /// this function will only return commitment proofs for values _already_ materialized
     ///  in the underlying store. otherwise it returns None.
-    pub fn get_data_with_proof_by_hash<T>(&mut self, hash: &TrieHash) -> InterpreterResult<Option<(T, Vec<u8>)>>
+    pub fn get_data_with_proof_by_hash<T>(
+        &mut self,
+        hash: &TrieHash,
+    ) -> InterpreterResult<Option<(T, Vec<u8>)>>
     where
         T: ClarityDeserializable<T>,
     {
@@ -404,7 +406,7 @@ impl<'a> RollbackWrapper<'a> {
             .map(|x| T::deserialize(&x))
             .transpose()
     }
-    
+
     /// DO NOT USE IN CONSENSUS CODE.
     ///
     /// Load data directly from the underlying store, given its trie hash.  The lookup map will not
diff --git a/clarity/src/vm/database/sqlite.rs b/clarity/src/vm/database/sqlite.rs
@@ -326,7 +326,7 @@ impl ClarityBackingStore for MemoryBackingStore {
 
     fn get_data_from_path(&mut self, hash: &TrieHash) -> Result<Option<String>> {
         SqliteConnection::get(self.get_side_store(), hash.to_string().as_str())
-    }    
+    }
 
     fn get_data_with_proof(&mut self, key: &str) -> Result<Option<(String, Vec<u8>)>> {
         Ok(SqliteConnection::get(self.get_side_store(), key)?.map(|x| (x, vec![])))
diff --git a/stackslib/src/chainstate/stacks/index/marf.rs b/stackslib/src/chainstate/stacks/index/marf.rs
@@ -126,7 +126,7 @@ pub trait MarfConnection<T: MarfTrieId> {
     fn get(&mut self, block_hash: &T, key: &str) -> Result<Option<MARFValue>, Error> {
         self.with_conn(|c| MARF::get_by_key(c, block_hash, key))
     }
-    
+
     /// Resolve a TrieHash from the MARF to a MARFValue with respect to the given block height.
     fn get_from_hash(&mut self, block_hash: &T, th: &TrieHash) -> Result<Option<MARFValue>, Error> {
         self.with_conn(|c| MARF::get_by_hash(c, block_hash, th))
@@ -1397,7 +1397,7 @@ impl<T: MarfTrieId> MARF<T> {
         let proof = TrieMerkleProof::from_raw_entry(&mut conn, key, &marf_value, block_hash)?;
         Ok(Some((marf_value, proof)))
     }
-    
+
     pub fn get_with_proof_from_hash(
         &mut self,
         block_hash: &T,
diff --git a/stackslib/src/chainstate/stacks/index/node.rs b/stackslib/src/chainstate/stacks/index/node.rs
@@ -32,8 +32,8 @@ use crate::chainstate::stacks::index::bits::{
     get_path_byte_len, get_ptrs_byte_len, path_from_bytes, ptrs_from_bytes, write_path_to_bytes,
 };
 use crate::chainstate::stacks::index::{
-    BlockMap, ClarityMarfTrieId, Error, MARFValue, MarfTrieId, TrieHasher,
-    TrieLeaf, MARF_VALUE_ENCODED_SIZE,
+    BlockMap, ClarityMarfTrieId, Error, MARFValue, MarfTrieId, TrieHasher, TrieLeaf,
+    MARF_VALUE_ENCODED_SIZE,
 };
 
 #[derive(Debug, Clone, PartialEq)]
diff --git a/stackslib/src/chainstate/stacks/index/proofs.rs b/stackslib/src/chainstate/stacks/index/proofs.rs
@@ -35,8 +35,7 @@ use crate::chainstate::stacks::index::bits::{
 use crate::chainstate::stacks::index::marf::MARF;
 use crate::chainstate::stacks::index::node::{
     clear_backptr, is_backptr, set_backptr, ConsensusSerializable, CursorError, TrieCursor,
-    TrieNode, TrieNode16, TrieNode256, TrieNode4, TrieNode48, TrieNodeID, TrieNodeType,
-    TriePtr,
+    TrieNode, TrieNode16, TrieNode256, TrieNode4, TrieNode48, TrieNodeID, TrieNodeType, TriePtr,
 };
 use crate::chainstate::stacks::index::storage::{TrieFileStorage, TrieStorageConnection};
 use crate::chainstate::stacks::index::trie::Trie;
diff --git a/stackslib/src/chainstate/stacks/index/storage.rs b/stackslib/src/chainstate/stacks/index/storage.rs
@@ -51,8 +51,7 @@ use crate::chainstate::stacks::index::node::{
 use crate::chainstate::stacks::index::profile::TrieBenchmark;
 use crate::chainstate::stacks::index::trie::Trie;
 use crate::chainstate::stacks::index::{
-    trie_sql, BlockMap, ClarityMarfTrieId, Error, MarfTrieId, TrieHasher,
-    TrieLeaf,
+    trie_sql, BlockMap, ClarityMarfTrieId, Error, MarfTrieId, TrieHasher, TrieLeaf,
 };
 use crate::util_lib::db::{
     sql_pragma, sqlite_open, tx_begin_immediate, tx_busy_handler, Error as db_error,
diff --git a/stackslib/src/chainstate/stacks/index/test/marf.rs b/stackslib/src/chainstate/stacks/index/test/marf.rs
@@ -32,9 +32,7 @@ use crate::chainstate::stacks::index::proofs::*;
 use crate::chainstate::stacks::index::storage::*;
 use crate::chainstate::stacks::index::test::*;
 use crate::chainstate::stacks::index::trie::*;
-use crate::chainstate::stacks::index::{
-    ClarityMarfTrieId, Error, MARFValue, TrieLeaf,
-};
+use crate::chainstate::stacks::index::{ClarityMarfTrieId, Error, MARFValue, TrieLeaf};
 
 #[test]
 fn marf_insert_different_leaf_same_block_100() {
diff --git a/stackslib/src/chainstate/stacks/index/test/mod.rs b/stackslib/src/chainstate/stacks/index/test/mod.rs
@@ -31,9 +31,7 @@ use crate::chainstate::stacks::index::node::*;
 use crate::chainstate::stacks::index::proofs::*;
 use crate::chainstate::stacks::index::storage::*;
 use crate::chainstate::stacks::index::trie::*;
-use crate::chainstate::stacks::index::{
-    MARFValue, MarfTrieId, TrieLeaf, TrieMerkleProof,
-};
+use crate::chainstate::stacks::index::{MARFValue, MarfTrieId, TrieLeaf, TrieMerkleProof};
 use crate::chainstate::stacks::{BlockHeaderHash, TrieHash};
 
 pub mod cache;
diff --git a/stackslib/src/chainstate/stacks/index/trie.rs b/stackslib/src/chainstate/stacks/index/trie.rs
@@ -39,9 +39,7 @@ use crate::chainstate::stacks::index::node::{
 use crate::chainstate::stacks::index::storage::{
     TrieFileStorage, TrieHashCalculationMode, TrieStorageConnection,
 };
-use crate::chainstate::stacks::index::{
-    Error, MarfTrieId, TrieHasher, TrieLeaf,
-};
+use crate::chainstate::stacks::index::{Error, MarfTrieId, TrieHasher, TrieLeaf};
 
 /// We don't actually instantiate a Trie, but we still need to pass a type parameter for the
 /// storage implementation.
diff --git a/stackslib/src/clarity_vm/database/marf.rs b/stackslib/src/clarity_vm/database/marf.rs
@@ -476,7 +476,7 @@ impl<'a> ClarityBackingStore for ReadOnlyMarfStore<'a> {
             })
             .transpose()
     }
-    
+
     fn get_data_from_path(&mut self, hash: &TrieHash) -> InterpreterResult<Option<String>> {
         trace!("MarfedKV get_from_hash: {:?} tip={}", hash, &self.chain_tip);
         self.marf
@@ -685,7 +685,7 @@ impl<'a> ClarityBackingStore for WritableMarfStore<'a> {
             })
             .transpose()
     }
-    
+
     fn get_data_from_path(&mut self, hash: &TrieHash) -> InterpreterResult<Option<String>> {
         trace!("MarfedKV get_from_hash: {:?} tip={}", hash, &self.chain_tip);
         self.marf
diff --git a/stackslib/src/clarity_vm/database/mod.rs b/stackslib/src/clarity_vm/database/mod.rs
@@ -1232,7 +1232,7 @@ impl ClarityBackingStore for MemoryBackingStore {
     fn get_data(&mut self, key: &str) -> InterpreterResult<Option<String>> {
         SqliteConnection::get(self.get_side_store(), key)
     }
-    
+
     fn get_data_from_path(&mut self, hash: &TrieHash) -> InterpreterResult<Option<String>> {
         SqliteConnection::get(self.get_side_store(), hash.to_string().as_str())
     }
@@ -1245,7 +1245,10 @@ impl ClarityBackingStore for MemoryBackingStore {
         &mut self,
         key: &TrieHash,
     ) -> InterpreterResult<Option<(String, Vec<u8>)>> {
-        Ok(SqliteConnection::get(self.get_side_store(), key.to_string().as_str())?.map(|x| (x, vec![])))
+        Ok(
+            SqliteConnection::get(self.get_side_store(), key.to_string().as_str())?
+                .map(|x| (x, vec![])),
+        )
     }
 
     fn get_side_store(&mut self) -> &Connection {
diff --git a/stackslib/src/core/tests/mod.rs b/stackslib/src/core/tests/mod.rs
@@ -48,7 +48,7 @@ use crate::chainstate::stacks::db::test::{
 };
 use crate::chainstate::stacks::db::{StacksChainState, StacksHeaderInfo};
 use crate::chainstate::stacks::events::StacksTransactionReceipt;
-use crate::chainstate::stacks::index::{MarfTrieId};
+use crate::chainstate::stacks::index::MarfTrieId;
 use crate::chainstate::stacks::miner::TransactionResult;
 use crate::chainstate::stacks::test::codec_all_transactions;
 use crate::chainstate::stacks::{
diff --git a/stackslib/src/net/api/getclaritymarfvalue.rs b/stackslib/src/net/api/getclaritymarfvalue.rs
@@ -18,8 +18,8 @@ use clarity::vm::clarity::ClarityConnection;
 use clarity::vm::representations::CONTRACT_PRINCIPAL_REGEX_STRING;
 use lazy_static::lazy_static;
 use regex::{Captures, Regex};
-use stacks_common::types::net::PeerHost;
 use stacks_common::types::chainstate::TrieHash;
+use stacks_common::types::net::PeerHost;
 use stacks_common::util::hash::to_hex;
 
 use crate::net::http::{
@@ -110,9 +110,10 @@ impl RPCRequestHandler for RPCGetClarityMarfRequestHandler {
         contents: HttpRequestContents,
         node: &mut StacksNodeState,
     ) -> Result<(HttpResponsePreamble, HttpResponseContents), NetError> {
-        let marf_key_hash = self.marf_key_hash.take().ok_or(NetError::SendError(
-            "`marf_key_hash` not set".to_string(),
-        ))?;
+        let marf_key_hash = self
+            .marf_key_hash
+            .take()
+            .ok_or(NetError::SendError("`marf_key_hash` not set".to_string()))?;
 
         let tip = match node.load_stacks_chain_tip(&preamble, &contents) {
             Ok(tip) => tip,
diff --git a/stackslib/src/net/api/tests/getclaritymarfvalue.rs b/stackslib/src/net/api/tests/getclaritymarfvalue.rs
@@ -19,8 +19,7 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use clarity::vm::types::{QualifiedContractIdentifier, StacksAddressExtensions};
 use clarity::vm::{ClarityName, ContractName};
 use stacks_common::codec::StacksMessageCodec;
-use stacks_common::types::chainstate::StacksAddress;
-use stacks_common::types::chainstate::TrieHash;
+use stacks_common::types::chainstate::{StacksAddress, TrieHash};
 use stacks_common::types::net::PeerHost;
 use stacks_common::types::Address;
 
@@ -39,8 +38,10 @@ fn test_try_parse_request() {
     let mut http = StacksHttp::new(addr.clone(), &ConnectionOptions::default());
 
     let vm_key_epoch = TrieHash::from_key("vm-epoch::epoch-version");
-    let vm_key_trip = TrieHash::from_key("vm::ST1SJ3DTE5DN7X54YDH5D64R3BCB6A2AG2ZQ8YPD5.counter::1::count");
-    let vm_key_quad = TrieHash::from_key("vm::ST1SJ3DTE5DN7X54YDH5D64R3BCB6A2AG2ZQ8YPD5.counter::0::data::1234");
+    let vm_key_trip =
+        TrieHash::from_key("vm::ST1SJ3DTE5DN7X54YDH5D64R3BCB6A2AG2ZQ8YPD5.counter::1::count");
+    let vm_key_quad =
+        TrieHash::from_key("vm::ST1SJ3DTE5DN7X54YDH5D64R3BCB6A2AG2ZQ8YPD5.counter::0::data::1234");
     let valid_keys = [vm_key_epoch, vm_key_trip, vm_key_quad];
 
     for key in valid_keys {
@@ -109,7 +110,9 @@ fn test_try_make_response() {
     // query non-existant var
     let request = StacksHttpRequest::new_getclaritymarf(
         addr.into(),
-        TrieHash::from_key("vm::ST2DS4MSWSGJ3W9FBC6BVT0Y92S345HY8N3T6AV7R.hello-world::1::does-not-exist"),
+        TrieHash::from_key(
+            "vm::ST2DS4MSWSGJ3W9FBC6BVT0Y92S345HY8N3T6AV7R.hello-world::1::does-not-exist",
+        ),
         TipRequest::UseLatestAnchoredTip,
         true,
     );

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ impl ClarityBackingStore for NullBackingStore {`
`214`	`214`	`fn get_data(&mut self, _key: &str) -> Result<Option<String>> {`
`215`	`215`	`panic!("NullBackingStore can't retrieve data")`
`216`	`216`	`}`
`217`		`-`
	`217`	`+`
`218`	`218`	`fn get_data_from_path(&mut self, _hash: &TrieHash) -> Result<Option<String>> {`
`219`	`219`	`panic!("NullBackingStore can't retrieve data")`
`220`	`220`	`}`