mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-27 01:07:57 +00:00
Run cargo fmt on the whole code base (#9394)
* Run cargo fmt on the whole code base * Second run * Add CI check * Fix compilation * More unnecessary braces * Handle weights * Use --all * Use correct attributes... * Fix UI tests * AHHHHHHHHH * 🤦 * Docs * Fix compilation * 🤷 * Please stop * 🤦 x 2 * More * make rustfmt.toml consistent with polkadot Co-authored-by: André Silva <andrerfosilva@gmail.com>
This commit is contained in:
@@ -16,30 +16,31 @@
|
||||
// limitations under the License.
|
||||
|
||||
/// A wrapper around `kvdb::Database` that implements `sp_database::Database` trait
|
||||
|
||||
use ::kvdb::{DBTransaction, KeyValueDB};
|
||||
|
||||
use crate::{Database, Change, ColumnId, Transaction, error};
|
||||
use crate::{error, Change, ColumnId, Database, Transaction};
|
||||
|
||||
struct DbAdapter<D: KeyValueDB + 'static>(D);
|
||||
|
||||
fn handle_err<T>(result: std::io::Result<T>) -> T {
|
||||
match result {
|
||||
Ok(r) => r,
|
||||
Err(e) => {
|
||||
Err(e) => {
|
||||
panic!("Critical database error: {:?}", e);
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/// Wrap RocksDb database into a trait object that implements `sp_database::Database`
|
||||
pub fn as_database<D, H>(db: D) -> std::sync::Arc<dyn Database<H>>
|
||||
where D: KeyValueDB + 'static, H: Clone + AsRef<[u8]>
|
||||
where
|
||||
D: KeyValueDB + 'static,
|
||||
H: Clone + AsRef<[u8]>,
|
||||
{
|
||||
std::sync::Arc::new(DbAdapter(db))
|
||||
}
|
||||
|
||||
impl <D: KeyValueDB> DbAdapter<D> {
|
||||
impl<D: KeyValueDB> DbAdapter<D> {
|
||||
// Returns counter key and counter value if it exists.
|
||||
fn read_counter(&self, col: ColumnId, key: &[u8]) -> error::Result<(Vec<u8>, Option<u32>)> {
|
||||
// Add a key suffix for the counter
|
||||
@@ -49,16 +50,16 @@ impl <D: KeyValueDB> DbAdapter<D> {
|
||||
Some(data) => {
|
||||
let mut counter_data = [0; 4];
|
||||
if data.len() != 4 {
|
||||
return Err(error::DatabaseError(Box::new(
|
||||
std::io::Error::new(std::io::ErrorKind::Other,
|
||||
format!("Unexpected counter len {}", data.len())))
|
||||
))
|
||||
return Err(error::DatabaseError(Box::new(std::io::Error::new(
|
||||
std::io::ErrorKind::Other,
|
||||
format!("Unexpected counter len {}", data.len()),
|
||||
))))
|
||||
}
|
||||
counter_data.copy_from_slice(&data);
|
||||
let counter = u32::from_le_bytes(counter_data);
|
||||
(counter_key, Some(counter))
|
||||
},
|
||||
None => (counter_key, None)
|
||||
None => (counter_key, None),
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -70,27 +71,29 @@ impl<D: KeyValueDB, H: Clone + AsRef<[u8]>> Database<H> for DbAdapter<D> {
|
||||
match change {
|
||||
Change::Set(col, key, value) => tx.put_vec(col, &key, value),
|
||||
Change::Remove(col, key) => tx.delete(col, &key),
|
||||
Change::Store(col, key, value) => {
|
||||
match self.read_counter(col, key.as_ref())? {
|
||||
(counter_key, Some(mut counter)) => {
|
||||
counter += 1;
|
||||
tx.put(col, &counter_key, &counter.to_le_bytes());
|
||||
},
|
||||
(counter_key, None) => {
|
||||
let d = 1u32.to_le_bytes();
|
||||
tx.put(col, &counter_key, &d);
|
||||
tx.put_vec(col, key.as_ref(), value);
|
||||
},
|
||||
}
|
||||
}
|
||||
Change::Store(col, key, value) => match self.read_counter(col, key.as_ref())? {
|
||||
(counter_key, Some(mut counter)) => {
|
||||
counter += 1;
|
||||
tx.put(col, &counter_key, &counter.to_le_bytes());
|
||||
},
|
||||
(counter_key, None) => {
|
||||
let d = 1u32.to_le_bytes();
|
||||
tx.put(col, &counter_key, &d);
|
||||
tx.put_vec(col, key.as_ref(), value);
|
||||
},
|
||||
},
|
||||
Change::Reference(col, key) => {
|
||||
if let (counter_key, Some(mut counter)) = self.read_counter(col, key.as_ref())? {
|
||||
if let (counter_key, Some(mut counter)) =
|
||||
self.read_counter(col, key.as_ref())?
|
||||
{
|
||||
counter += 1;
|
||||
tx.put(col, &counter_key, &counter.to_le_bytes());
|
||||
}
|
||||
}
|
||||
},
|
||||
Change::Release(col, key) => {
|
||||
if let (counter_key, Some(mut counter)) = self.read_counter(col, key.as_ref())? {
|
||||
if let (counter_key, Some(mut counter)) =
|
||||
self.read_counter(col, key.as_ref())?
|
||||
{
|
||||
counter -= 1;
|
||||
if counter == 0 {
|
||||
tx.delete(col, &counter_key);
|
||||
@@ -99,7 +102,7 @@ impl<D: KeyValueDB, H: Clone + AsRef<[u8]>> Database<H> for DbAdapter<D> {
|
||||
tx.put(col, &counter_key, &counter.to_le_bytes());
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
self.0.write(tx).map_err(|e| error::DatabaseError(Box::new(e)))
|
||||
|
||||
Reference in New Issue
Block a user