pezkuwichain/pezkuwi-sdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

style: Migrate to stable-only rustfmt configuration

Browse Source 
- Remove nightly-only features from .rustfmt.toml and vendor/ss58-registry/rustfmt.toml
- Removed features: imports_granularity, wrap_comments, comment_width,
  reorder_impl_items, spaces_around_ranges, binop_separator,
  match_arm_blocks, trailing_semicolon, trailing_comma
- Format all 898 affected files with stable rustfmt
- Ensures long-term reliability without nightly toolchain dependency
This commit is contained in:
Kurdistan Tech Ministry
2025-12-22 17:12:58 +03:00
parent 65b7f5e640
commit 4c8f281051
898 changed files with 8671 additions and 6432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bizinikiwi/client/db/src/lib.rs
+50 -40
View File
@@ -598,10 +598,11 @@ impl<Block: BlockT> BlockchainDb<Block> {
)? {
Some(justifications) => match Decode::decode(&mut &justifications[..]) {
Ok(justifications) => Ok(Some(justifications)),
Err(err) =>
Err(err) => {
return Err(pezsp_blockchain::Error::Backend(format!(
"Error decoding justifications: {err}"
))),
)))
},
},
None => Ok(None),
}
@@ -614,10 +615,11 @@ impl<Block: BlockT> BlockchainDb<Block> {
// Plain body
match Decode::decode(&mut &body[..]) {
Ok(body) => return Ok(Some(body)),
Err(err) =>
Err(err) => {
return Err(pezsp_blockchain::Error::Backend(format!(
"Error decoding body: {err}"
))),
)))
},
}
}
@@ -646,10 +648,11 @@ impl<Block: BlockT> BlockchainDb<Block> {
)?;
body.push(ex);
},
None =>
None => {
return Err(pezsp_blockchain::Error::Backend(format!(
"Missing indexed transaction {hash:?}"
))),
)))
},
};
},
DbExtrinsic::Full(ex) => {
@@ -659,10 +662,11 @@ impl<Block: BlockT> BlockchainDb<Block> {
}
return Ok(Some(body));
},
Err(err) =>
Err(err) => {
return Err(pezsp_blockchain::Error::Backend(format!(
"Error decoding body list: {err}",
))),
)))
},
}
}
Ok(None)
@@ -777,17 +781,19 @@ impl<Block: BlockT> pezsc_client_api::blockchain::Backend<Block> for BlockchainD
if let DbExtrinsic::Indexed { hash, .. } = ex {
match self.db.get(columns::TRANSACTION, hash.as_ref()) {
Some(t) => transactions.push(t),
None =>
None => {
return Err(pezsp_blockchain::Error::Backend(format!(
"Missing indexed transaction {hash:?}",
))),
)))
},
}
}
}
Ok(Some(transactions))
},
Err(err) =>
Err(pezsp_blockchain::Error::Backend(format!("Error decoding body list: {err}"))),
Err(err) => {
Err(pezsp_blockchain::Error::Backend(format!("Error decoding body list: {err}")))
},
}
}
}
@@ -851,8 +857,9 @@ impl<Block: BlockT> BlockImportOperation<Block> {
count += 1;
let key = crate::offchain::concatenate_prefix_and_key(&prefix, &key);
match value_operation {
OffchainOverlayedChange::SetValue(val) =>
transaction.set_from_vec(columns::OFFCHAIN, &key, val),
OffchainOverlayedChange::SetValue(val) => {
transaction.set_from_vec(columns::OFFCHAIN, &key, val)
},
OffchainOverlayedChange::Remove => transaction.remove(columns::OFFCHAIN, &key),
}
}
@@ -1275,9 +1282,9 @@ impl<Block: BlockT> Backend<Block> {
// Older DB versions have no last state key. Check if the state is available and set it.
let info = backend.blockchain.info();
if info.finalized_state.is_none() &&
info.finalized_hash != Default::default() &&
pezsc_client_api::Backend::have_state_at(
if info.finalized_state.is_none()
&& info.finalized_hash != Default::default()
&& pezsc_client_api::Backend::have_state_at(
&backend,
info.finalized_hash,
info.finalized_number,
@@ -1316,8 +1323,8 @@ impl<Block: BlockT> Backend<Block> {
let meta = self.blockchain.meta.read();
if meta.best_number.saturating_sub(best_number).saturated_into::<u64>() >
self.canonicalization_delay
if meta.best_number.saturating_sub(best_number).saturated_into::<u64>()
> self.canonicalization_delay
{
return Err(pezsp_blockchain::Error::SetHeadTooOld);
}
@@ -1377,8 +1384,8 @@ impl<Block: BlockT> Backend<Block> {
) -> ClientResult<()> {
let last_finalized =
last_finalized.unwrap_or_else(|| self.blockchain.meta.read().finalized_hash);
if last_finalized != self.blockchain.meta.read().genesis_hash &&
*header.parent_hash() != last_finalized
if last_finalized != self.blockchain.meta.read().genesis_hash
&& *header.parent_hash() != last_finalized
{
return Err(pezsp_blockchain::Error::NonSequentialFinalization(format!(
"Last finalized {last_finalized:?} not parent of {:?}",
@@ -1649,8 +1656,8 @@ impl<Block: BlockT> Backend<Block> {
let finalized = number_u64 == 0 || pending_block.leaf_state.is_final();
finalized
} else {
(number.is_zero() && last_finalized_num.is_zero()) ||
pending_block.leaf_state.is_final()
(number.is_zero() && last_finalized_num.is_zero())
|| pending_block.leaf_state.is_final()
};
let header = &pending_block.header;
@@ -1732,7 +1739,7 @@ impl<Block: BlockT> Backend<Block> {
if let Some(mut gap) = block_gap {
match gap.gap_type {
BlockGapType::MissingHeaderAndBody =>
BlockGapType::MissingHeaderAndBody => {
if number == gap.start {
gap.start += One::one();
utils::insert_number_to_key_mapping(
@@ -1751,7 +1758,8 @@ impl<Block: BlockT> Backend<Block> {
debug!(target: "db", "Update block gap. {block_gap:?}");
}
block_gap_updated = true;
},
}
},
BlockGapType::MissingBody => {
// Gap increased when syncing the header chain during fast sync.
if number == gap.end + One::one() && !existing_body {
@@ -1782,8 +1790,8 @@ impl<Block: BlockT> Backend<Block> {
},
}
} else if operation.create_gap {
if number > best_num + One::one() &&
self.blockchain.header(parent_hash)?.is_none()
if number > best_num + One::one()
&& self.blockchain.header(parent_hash)?.is_none()
{
let gap = BlockGap {
start: best_num + One::one(),
@@ -1793,9 +1801,9 @@ impl<Block: BlockT> Backend<Block> {
insert_new_gap(&mut transaction, gap, &mut block_gap);
block_gap_updated = true;
debug!(target: "db", "Detected block gap (warp sync) {block_gap:?}");
} else if number == best_num + One::one() &&
self.blockchain.header(parent_hash)?.is_some() &&
!existing_body
} else if number == best_num + One::one()
&& self.blockchain.header(parent_hash)?.is_some()
&& !existing_body
{
let gap = BlockGap {
start: number,
@@ -1893,8 +1901,8 @@ impl<Block: BlockT> Backend<Block> {
LastCanonicalized::NotCanonicalizing => false,
};
if requires_canonicalization &&
pezsc_client_api::Backend::have_state_at(self, f_hash, f_num)
if requires_canonicalization
&& pezsc_client_api::Backend::have_state_at(self, f_hash, f_num)
{
let commit = self.storage.state_db.canonicalize_block(&f_hash).map_err(
pezsp_blockchain::Error::from_state_db::<
@@ -2000,16 +2008,18 @@ impl<Block: BlockT> Backend<Block> {
id,
)?;
match Vec::<DbExtrinsic<Block>>::decode(&mut &index[..]) {
Ok(index) =>
Ok(index) => {
for ex in index {
if let DbExtrinsic::Indexed { hash, .. } = ex {
transaction.release(columns::TRANSACTION, hash);
}
},
Err(err) =>
}
},
Err(err) => {
return Err(pezsp_blockchain::Error::Backend(format!(
"Error decoding body list: {err}",
))),
)))
},
}
}
Ok(())
@@ -2234,8 +2244,8 @@ impl<Block: BlockT> pezsc_client_api::backend::Backend<Block> for Backend<Block>
let last_finalized = self.blockchain.last_finalized()?;
// We can do a quick check first, before doing a proper but more expensive check
if number > self.blockchain.info().finalized_number ||
(hash != last_finalized && !is_descendent_of(&hash, &last_finalized)?)
if number > self.blockchain.info().finalized_number
|| (hash != last_finalized && !is_descendent_of(&hash, &last_finalized)?)
{
return Err(ClientError::NotInFinalizedChain);
}
@@ -2370,8 +2380,8 @@ impl<Block: BlockT> pezsc_client_api::backend::Backend<Block> for Backend<Block>
reverted_finalized.insert(removed_hash);
if let Some((hash, _)) = self.blockchain.info().finalized_state {
if hash == hash_to_revert {
if !number_to_revert.is_zero() &&
self.have_state_at(prev_hash, prev_number)
if !number_to_revert.is_zero()
&& self.have_state_at(prev_hash, prev_number)
{
let lookup_key = utils::number_and_hash_to_lookup_key(
prev_number,
bizinikiwi/client/db/src/parity_db.rs
+6 -4
View File
@@ -97,7 +97,7 @@ impl<H: Clone + AsRef<[u8]>> Database<H> for DbAdapter {
Some(match change {
Change::Set(col, key, value) => (col as u8, key, Some(value)),
Change::Remove(col, key) => (col as u8, key, None),
Change::Store(col, key, value) =>
Change::Store(col, key, value) => {
if ref_counted_column(col) {
(col as u8, key.as_ref().to_vec(), Some(value))
} else {
@@ -105,7 +105,8 @@ impl<H: Clone + AsRef<[u8]>> Database<H> for DbAdapter {
not_ref_counted_column.push(col);
}
return None;
},
}
},
Change::Reference(col, key) => {
if ref_counted_column(col) {
// FIXME accessing value is not strictly needed, optimize this in parity-db.
@@ -118,7 +119,7 @@ impl<H: Clone + AsRef<[u8]>> Database<H> for DbAdapter {
return None;
}
},
Change::Release(col, key) =>
Change::Release(col, key) => {
if ref_counted_column(col) {
(col as u8, key.as_ref().to_vec(), None)
} else {
@@ -126,7 +127,8 @@ impl<H: Clone + AsRef<[u8]>> Database<H> for DbAdapter {
not_ref_counted_column.push(col);
}
return None;
},
}
},
})
}));
bizinikiwi/client/db/src/upgrade.rs
+3 -2
View File
@@ -163,8 +163,9 @@ fn migrate_3_to_4<Block: BlockT>(db_path: &Path, _db_type: DatabaseType) -> Upgr
/// If the file does not exist returns 0.
fn current_version(path: &Path) -> UpgradeResult<u32> {
match fs::File::open(version_file_path(path)) {
Err(ref err) if err.kind() == ErrorKind::NotFound =>
Err(UpgradeError::MissingDatabaseVersionFile),
Err(ref err) if err.kind() == ErrorKind::NotFound => {
Err(UpgradeError::MissingDatabaseVersionFile)
},
Err(_) => Err(UpgradeError::UnknownDatabaseVersion),
Ok(mut file) => {
let mut s = String::new();
bizinikiwi/client/db/src/utils.rs
+17 -12
View File
@@ -202,8 +202,9 @@ fn open_database_at<Block: BlockT>(
let db: Arc<dyn Database<DbHash>> = match &db_source {
DatabaseSource::ParityDb { path } => open_parity_db::<Block>(path, db_type, create)?,
#[cfg(feature = "rocksdb")]
DatabaseSource::RocksDb { path, cache_size } =>
open_kvdb_rocksdb::<Block>(path, db_type, create, *cache_size)?,
DatabaseSource::RocksDb { path, cache_size } => {
open_kvdb_rocksdb::<Block>(path, db_type, create, *cache_size)?
},
DatabaseSource::Custom { db, require_create_flag } => {
if *require_create_flag && !create {
return Err(OpenDbError::DoesNotExist);
@@ -214,8 +215,9 @@ fn open_database_at<Block: BlockT>(
// check if rocksdb exists first, if not, open paritydb
match open_kvdb_rocksdb::<Block>(rocksdb_path, db_type, false, *cache_size) {
Ok(db) => db,
Err(OpenDbError::NotEnabled(_)) | Err(OpenDbError::DoesNotExist) =>
open_parity_db::<Block>(paritydb_path, db_type, create)?,
Err(OpenDbError::NotEnabled(_)) | Err(OpenDbError::DoesNotExist) => {
open_parity_db::<Block>(paritydb_path, db_type, create)?
},
Err(as_is) => return Err(as_is),
}
},
@@ -368,13 +370,14 @@ pub fn check_database_type(
db_type: DatabaseType,
) -> Result<(), OpenDbError> {
match db.get(COLUMN_META, meta_keys::TYPE) {
Some(stored_type) =>
Some(stored_type) => {
if db_type.as_str().as_bytes() != &*stored_type {
return Err(OpenDbError::UnexpectedDbType {
expected: db_type,
found: stored_type.to_owned(),
});
},
}
},
None => {
let mut transaction = Transaction::new();
transaction.set(COLUMN_META, meta_keys::TYPE, db_type.as_str().as_bytes());
@@ -396,8 +399,8 @@ fn maybe_migrate_to_type_subdir<Block: BlockT>(
// Do we have to migrate to a database-type-based subdirectory layout:
// See if there's a file identifying a rocksdb or paritydb folder in the parent dir and
// the target path ends in a role specific directory
if (basedir.join("db_version").exists() || basedir.join("metadata").exists()) &&
(p.ends_with(DatabaseType::Full.as_str()))
if (basedir.join("db_version").exists() || basedir.join("metadata").exists())
&& (p.ends_with(DatabaseType::Full.as_str()))
{
// Try to open the database to check if the current `DatabaseType` matches the type of
// database stored in the target directory and close the database on success.
@@ -487,7 +490,7 @@ where
{
let genesis_hash: Block::Hash = match read_genesis_hash(db)? {
Some(genesis_hash) => genesis_hash,
None =>
None => {
return Ok(Meta {
best_hash: Default::default(),
best_number: Zero::zero(),
@@ -496,7 +499,8 @@ where
genesis_hash: Default::default(),
finalized_state: None,
block_gap: None,
}),
})
},
};
let load_meta_block = |desc, key| -> Result<_, pezsp_blockchain::Error> {
@@ -546,10 +550,11 @@ where
BLOCK_GAP_CURRENT_VERSION => db
.get(COLUMN_META, meta_keys::BLOCK_GAP)
.and_then(|d| Decode::decode(&mut d.as_slice()).ok()),
v =>
v => {
return Err(pezsp_blockchain::Error::Backend(format!(
"Unsupported block gap DB version: {v}"
))),
)))
},
},
};
debug!(target: "db", "block_gap={:?}", block_gap);