style: formatting

dashpay · Feb 8, 2024 · b20de39 · b20de39
1 parent ec24038
commit b20de39
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/storage/src/rocksdb_storage/storage.rs b/storage/src/rocksdb_storage/storage.rs
@@ -48,12 +48,12 @@ use super::{
     PrefixedRocksDbImmediateStorageContext, PrefixedRocksDbStorageContext,
     PrefixedRocksDbTransactionContext,
 };
-use crate::Error::StorageError;
 use crate::{
     error,
     error::Error::{CostError, RocksDBError},
     storage::AbstractBatchOperation,
     worst_case_costs::WorstKeyLength,
+    Error::StorageError,
     Storage, StorageBatch,
 };
 
@@ -512,10 +512,10 @@ impl RocksDbStorage {
 }
 
 impl<'db> Storage<'db> for RocksDbStorage {
-    type Transaction = Tx<'db>;
     type BatchStorageContext = PrefixedRocksDbStorageContext<'db>;
     type BatchTransactionalStorageContext = PrefixedRocksDbTransactionContext<'db>;
     type ImmediateStorageContext = PrefixedRocksDbImmediateStorageContext<'db>;
+    type Transaction = Tx<'db>;
 
     fn start_transaction(&'db self) -> Self::Transaction {
         match self {

diff --git a/storage/src/rocksdb_storage/storage_context/context_immediate.rs b/storage/src/rocksdb_storage/storage_context/context_immediate.rs
@@ -36,11 +36,12 @@ use grovedb_costs::{
 use rocksdb::{ColumnFamily, OptimisticTransactionDB, WriteBatchWithTransaction};
 
 use super::{make_prefixed_key, PrefixedRocksDbBatch, PrefixedRocksDbRawIterator};
-use crate::rocksdb_storage::storage::NonTransactionalDb;
 use crate::{
     error,
     error::Error::RocksDBError,
-    rocksdb_storage::storage::{SubtreePrefix, Tx, AUX_CF_NAME, META_CF_NAME, ROOTS_CF_NAME},
+    rocksdb_storage::storage::{
+        NonTransactionalDb, SubtreePrefix, Tx, AUX_CF_NAME, META_CF_NAME, ROOTS_CF_NAME,
+    },
     StorageContext,
 };
 

diff --git a/storage/src/rocksdb_storage/storage_context/context_no_tx.rs b/storage/src/rocksdb_storage/storage_context/context_no_tx.rs
@@ -36,11 +36,12 @@ use grovedb_costs::{
 use rocksdb::{ColumnFamily, OptimisticTransactionDB};
 
 use super::{batch::PrefixedMultiContextBatchPart, make_prefixed_key, PrefixedRocksDbRawIterator};
-use crate::rocksdb_storage::storage::NonTransactionalDb;
 use crate::{
     error,
     error::Error::RocksDBError,
-    rocksdb_storage::storage::{SubtreePrefix, AUX_CF_NAME, META_CF_NAME, ROOTS_CF_NAME},
+    rocksdb_storage::storage::{
+        NonTransactionalDb, SubtreePrefix, AUX_CF_NAME, META_CF_NAME, ROOTS_CF_NAME,
+    },
     StorageBatch, StorageContext,
 };
 

diff --git a/storage/src/rocksdb_storage/storage_context/context_tx.rs b/storage/src/rocksdb_storage/storage_context/context_tx.rs
@@ -36,12 +36,15 @@ use grovedb_costs::{
 use rocksdb::{ColumnFamily, OptimisticTransactionDB};
 
 use super::{batch::PrefixedMultiContextBatchPart, make_prefixed_key, PrefixedRocksDbRawIterator};
-use crate::rocksdb_storage::storage::NonTransactionalDb;
-use crate::rocksdb_storage::storage_context::context_no_tx::PrefixedSecondaryRocksDbStorageContext;
 use crate::{
     error,
     error::Error::RocksDBError,
-    rocksdb_storage::storage::{SubtreePrefix, Tx, AUX_CF_NAME, META_CF_NAME, ROOTS_CF_NAME},
+    rocksdb_storage::{
+        storage::{
+            NonTransactionalDb, SubtreePrefix, Tx, AUX_CF_NAME, META_CF_NAME, ROOTS_CF_NAME,
+        },
+        storage_context::context_no_tx::PrefixedSecondaryRocksDbStorageContext,
+    },
     RawIterator, StorageBatch, StorageContext,
 };
 

diff --git a/storage/src/rocksdb_storage/test_utils.rs b/storage/src/rocksdb_storage/test_utils.rs
@@ -28,8 +28,7 @@
 
 //! Useful utilities for testing.
 
-use std::cell::RefCell;
-use std::ops::Deref;
+use std::{cell::RefCell, ops::Deref};
 
 use tempfile::TempDir;