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/utils/txtesttool/bin/main.rs
+9 -6
View File
@@ -13,21 +13,23 @@ use bizinikiwi_txtesttool::{
runner::DefaultTxTask,
scenario::{AccountsDescription, ChainType, ScenarioBuilder, ScenarioType},
subxt_transaction::{
self, generate_ecdsa_keypair, generate_sr25519_keypair, EthRuntimeConfig, EthTransaction,
EthTransactionsSink, BizinikiwTransaction, BizinikiwTransactionsSink, SENDER_SEED,
self, generate_ecdsa_keypair, generate_sr25519_keypair, BizinikiwTransaction,
BizinikiwTransactionsSink, EthRuntimeConfig, EthTransaction, EthTransactionsSink,
SENDER_SEED,
},
};
use clap::Parser;
use codec::Compact;
use std::{fs, fs::File, io::BufReader, time::Duration};
use pezkuwi_subxt::{ext::frame_metadata::RuntimeMetadataPrefixed, PezkuwiConfig};
use std::{fs, fs::File, io::BufReader, time::Duration};
use tracing::info;
macro_rules! populate_scenario_builder {
($scenario_builder:expr, $scenario_type:expr) => {{
match $scenario_type {
ScenarioType::OneShot { account, nonce } =>
$scenario_builder.with_account_id(account.clone()).with_nonce_from(*nonce),
ScenarioType::OneShot { account, nonce } => {
$scenario_builder.with_account_id(account.clone()).with_nonce_from(*nonce)
},
ScenarioType::FromSingleAccount { account, from, count } => $scenario_builder
.with_account_id(account.clone())
.with_nonce_from(*from)
@@ -161,7 +163,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
CliCommand::Metadata { ws } => {
// Handle metadata command
use codec::Decode;
let api = pezkuwi_subxt::OnlineClient::<EthRuntimeConfig>::from_insecure_url(ws).await?;
let api =
pezkuwi_subxt::OnlineClient::<EthRuntimeConfig>::from_insecure_url(ws).await?;
let runtime_apis = api.runtime_api().at_latest().await?;
let raw_bytes: Vec<u8> = runtime_apis.call_raw("Metadata_metadata", None).await?;
let (_, meta): (Compact<u32>, RuntimeMetadataPrefixed) =
bizinikiwi/utils/txtesttool/src/execution_log.rs
+27 -20
View File
@@ -9,6 +9,7 @@ use crate::{
};
use average::{Estimate, Max, Mean, Min, Quantile};
use parking_lot::RwLock;
use pezkuwi_subxt_core::config::Hash as BlockHash;
use serde::{de::DeserializeOwned, Deserialize, Serialize};
use std::{
collections::HashMap,
@@ -22,7 +23,6 @@ use std::{
},
time::{Duration, SystemTime},
};
use pezkuwi_subxt_core::config::Hash as BlockHash;
use tracing::{debug, info, trace};
pub const STAT_TARGET: &str = "stat";
@@ -115,11 +115,11 @@ impl Counters {
}
pub fn buffered(&self) -> usize {
self.popped.load(Ordering::Relaxed) -
(self.submit_and_watch_success.load(Ordering::Relaxed) +
self.submit_and_watch_error.load(Ordering::Relaxed)) -
(self.submit_success.load(Ordering::Relaxed) +
self.submit_error.load(Ordering::Relaxed))
self.popped.load(Ordering::Relaxed)
- (self.submit_and_watch_success.load(Ordering::Relaxed)
+ self.submit_and_watch_error.load(Ordering::Relaxed))
- (self.submit_success.load(Ordering::Relaxed)
+ self.submit_error.load(Ordering::Relaxed))
}
fn count_event<H: BlockHash>(&self, event: &ExecutionEvent<H>) {
@@ -128,10 +128,12 @@ impl Counters {
ExecutionEvent::Sent(_) => Self::inc(&self.sent),
ExecutionEvent::SubmitResult(_, Ok(_)) => Self::inc(&self.submit_success),
ExecutionEvent::SubmitResult(_, Err(_)) => Self::inc(&self.submit_error),
ExecutionEvent::SubmitAndWatchResult(_, Ok(_)) =>
Self::inc(&self.submit_and_watch_success),
ExecutionEvent::SubmitAndWatchResult(_, Err(_)) =>
Self::inc(&self.submit_and_watch_error),
ExecutionEvent::SubmitAndWatchResult(_, Ok(_)) => {
Self::inc(&self.submit_and_watch_success)
},
ExecutionEvent::SubmitAndWatchResult(_, Err(_)) => {
Self::inc(&self.submit_and_watch_error)
},
ExecutionEvent::FinalizedMonitor(_, _) => Self::inc(&self.finalized_monitor),
ExecutionEvent::TxPoolEvent(_, status) => match status {
TransactionStatus::Validated => Self::inc(&self.ts_validated),
@@ -314,8 +316,9 @@ impl<H: BlockHash + 'static> ExecutionLog for TransactionExecutionLog<H> {
if match event {
// note: dedup in block events - on the stats line we want to see transactions included,
// not events count
ExecutionEvent::TxPoolEvent(_, TransactionStatus::InBlock(_)) =>
self.in_blocks().is_empty(),
ExecutionEvent::TxPoolEvent(_, TransactionStatus::InBlock(_)) => {
self.in_blocks().is_empty()
},
_ => true,
} {
self.total_counters.count_event(&event);
@@ -437,8 +440,9 @@ impl<H: BlockHash + 'static> ExecutionLog for TransactionExecutionLog<H> {
fn time_to_result(&self) -> Option<Duration> {
let ets = self.events.read().iter().find_map(|e| match e {
ExecutionEvent::SubmitAndWatchResult(i, _) | ExecutionEvent::SubmitResult(i, _) =>
Some(*i),
ExecutionEvent::SubmitAndWatchResult(i, _) | ExecutionEvent::SubmitResult(i, _) => {
Some(*i)
},
_ => None,
});
Self::duration_since_timestamp(self.get_sent_time_stamp(), ets)
@@ -449,8 +453,9 @@ impl<H: BlockHash + 'static> ExecutionLog for TransactionExecutionLog<H> {
.read()
.iter()
.filter_map(|e| match e {
ExecutionEvent::TxPoolEvent(_, TransactionStatus::Invalid(reason)) =>
Some(reason.clone()),
ExecutionEvent::TxPoolEvent(_, TransactionStatus::Invalid(reason)) => {
Some(reason.clone())
},
_ => None,
})
.collect()
@@ -461,8 +466,9 @@ impl<H: BlockHash + 'static> ExecutionLog for TransactionExecutionLog<H> {
.read()
.iter()
.filter_map(|e| match e {
ExecutionEvent::TxPoolEvent(_, TransactionStatus::Error(reason)) =>
Some(reason.clone()),
ExecutionEvent::TxPoolEvent(_, TransactionStatus::Error(reason)) => {
Some(reason.clone())
},
_ => None,
})
.collect()
@@ -473,8 +479,9 @@ impl<H: BlockHash + 'static> ExecutionLog for TransactionExecutionLog<H> {
.read()
.iter()
.filter_map(|e| match e {
ExecutionEvent::TxPoolEvent(_, TransactionStatus::Dropped(reason)) =>
Some(reason.clone()),
ExecutionEvent::TxPoolEvent(_, TransactionStatus::Dropped(reason)) => {
Some(reason.clone())
},
_ => None,
})
.collect()
bizinikiwi/utils/txtesttool/src/fake_transaction.rs
+14 -11
View File
@@ -9,6 +9,7 @@ use crate::{
};
use futures::stream::{self};
use futures_util::StreamExt;
use pezkuwi_subxt::ext::codec::{Decode, Encode};
use serde::{Deserialize, Serialize};
use std::{
any::Any,
@@ -17,7 +18,6 @@ use std::{
sync::atomic::{AtomicUsize, Ordering},
time::Duration,
};
use pezkuwi_subxt::ext::codec::{Decode, Encode};
use tokio::task::yield_now;
use tracing::trace;
@@ -319,16 +319,19 @@ impl FakeTransaction {
trace!(target:LOG_TARGET, "submit_result: delayed: {:?}", self.hash);
match event {
TransactionStatus::Finalized(_) => Ok(self.hash),
TransactionStatus::Dropped(message) =>
Err(Error::Other(format!("submit-error:dropped:{message}").to_string())),
TransactionStatus::Invalid(message) =>
Err(Error::Other(format!("submit-error:invalid:{message}").to_string())),
TransactionStatus::Error(message) =>
Err(Error::Other(format!("submit-error:error:{message}").to_string())),
TransactionStatus::Validated |
TransactionStatus::NoLongerInBestBlock |
TransactionStatus::Broadcasted |
TransactionStatus::InBlock(_) => todo!(),
TransactionStatus::Dropped(message) => {
Err(Error::Other(format!("submit-error:dropped:{message}").to_string()))
},
TransactionStatus::Invalid(message) => {
Err(Error::Other(format!("submit-error:invalid:{message}").to_string()))
},
TransactionStatus::Error(message) => {
Err(Error::Other(format!("submit-error:error:{message}").to_string()))
},
TransactionStatus::Validated
| TransactionStatus::NoLongerInBestBlock
| TransactionStatus::Broadcasted
| TransactionStatus::InBlock(_) => todo!(),
}
}
}
bizinikiwi/utils/txtesttool/src/lib.rs
+2 -2
View File
@@ -83,8 +83,8 @@ pub fn init_logger() {
}
impl<S> Filter<S> for F {
fn enabled(&self, meta: &Metadata<'_>, cx: &Context<'_, S>) -> bool {
!self.env_filter.enabled(meta, cx.clone()) &&
meta.target() == execution_log::STAT_TARGET
!self.env_filter.enabled(meta, cx.clone())
&& meta.target() == execution_log::STAT_TARGET
}
}
bizinikiwi/utils/txtesttool/src/runner.rs
+1 -1
View File
@@ -12,13 +12,13 @@ use crate::{
};
use async_trait::async_trait;
use futures::{stream::FuturesUnordered, Future, StreamExt};
use pezkuwi_subxt_core::config::Hash as BlockHash;
use std::{
path::Path,
pin::Pin,
sync::Arc,
time::{Duration, Instant, SystemTime},
};
use pezkuwi_subxt_core::config::Hash as BlockHash;
use tokio::{
select,
sync::mpsc::{channel, Receiver, Sender},
bizinikiwi/utils/txtesttool/src/scenario.rs
+4 -4
View File
@@ -18,12 +18,12 @@ use crate::{
runner::{DefaultTxTask, Runner, TxTask},
subxt_transaction::{
eth_transfer_payload_builder, generate_ecdsa_keypair, generate_sr25519_keypair,
remark_payload_builder, sub_transfer_payload_builder, EthPayloadBuilderFn, EthTransaction,
EthTransactionsSink, EthTxBuildContext, SubPayloadBuilderFn, SubTxBuildContext,
BizinikiwTransaction, BizinikiwTransactionsSink,
remark_payload_builder, sub_transfer_payload_builder, BizinikiwTransaction,
BizinikiwTransactionsSink, EthPayloadBuilderFn, EthTransaction, EthTransactionsSink,
EthTxBuildContext, SubPayloadBuilderFn, SubTxBuildContext,
},
transaction::{
BuildTransactionParams, EthTransactionBuilder, BizinikiwTransactionBuilder, Transaction,
BizinikiwTransactionBuilder, BuildTransactionParams, EthTransactionBuilder, Transaction,
TransactionBuilder, TransactionCall, TransactionRecipe, TransactionsSink,
},
};
bizinikiwi/utils/txtesttool/src/subxt_api_connector.rs
+1 -1
View File
@@ -2,8 +2,8 @@
// This file is dual-licensed as Apache-2.0 or GPL-3.0.
// see LICENSE for license details.
use std::{error::Error, sync::Arc, time::Duration};
use pezkuwi_subxt::OnlineClient;
use std::{error::Error, sync::Arc, time::Duration};
use tracing::info;
use crate::helpers;
bizinikiwi/utils/txtesttool/src/subxt_transaction.rs
+17 -14
View File
@@ -10,12 +10,6 @@ use crate::{
use async_trait::async_trait;
use futures::StreamExt;
use parking_lot::RwLock;
use std::{
any::Any,
collections::HashMap,
sync::Arc,
time::{Duration, Instant},
};
pub use pezkuwi_subxt::dynamic;
use pezkuwi_subxt::{
backend::rpc::RpcClient,
@@ -36,6 +30,12 @@ use pezkuwi_subxt_signer::{
eth::{dev as eth_dev, Keypair as EthKeypair, Signature},
sr25519::{dev as sr25519_dev, Keypair as SrPair},
};
use std::{
any::Any,
collections::HashMap,
sync::Arc,
time::{Duration, Instant},
};
use tracing::{debug, error, trace};
const LOG_TARGET: &str = "subxt_tx";
@@ -49,14 +49,17 @@ impl pezkuwi_subxt::Config for EthRuntimeConfig {
type Address = AccountId20;
type Signature = Signature;
type Hasher = pezkuwi_subxt::config::bizinikiwi::BlakeTwo256;
type Header =
pezkuwi_subxt::config::bizinikiwi::BizinikiwiHeader<u32, pezkuwi_subxt::config::bizinikiwi::BlakeTwo256>;
type Header = pezkuwi_subxt::config::bizinikiwi::BizinikiwiHeader<
u32,
pezkuwi_subxt::config::bizinikiwi::BlakeTwo256,
>;
type ExtrinsicParams = pezkuwi_subxt::config::DefaultExtrinsicParams<Self>;
type AssetId = u32;
}
/// Type alias for subxt config hash (Output of Hasher).
pub(crate) type HashOf<C> = <<C as pezkuwi_subxt::Config>::Hasher as pezkuwi_subxt::config::Hasher>::Output;
pub(crate) type HashOf<C> =
<<C as pezkuwi_subxt::Config>::Hasher as pezkuwi_subxt::config::Hasher>::Output;
/// Type alias for subxt account id.
pub(crate) type AccountIdOf<C> = <C as pezkuwi_subxt::Config>::AccountId;
@@ -325,9 +328,8 @@ where
.ok_or_else(|| {
format!("Sender account {:?} does not exist", hex::encode(account.clone()))
})?;
let value: pezkuwi_subxt::dynamic::Value = storage_value
.decode()
.map_err(|e| format!("Failed to decode storage: {e:?}"))?;
let value: pezkuwi_subxt::dynamic::Value =
storage_value.decode().map_err(|e| format!("Failed to decode storage: {e:?}"))?;
debug!(target:LOG_TARGET,"account has free balance: {:?}", value.at("data").at("free"));
debug!(target:LOG_TARGET,"account has nonce: {:?}", value.at("nonce"));
@@ -612,8 +614,9 @@ where
for _ in 0..DEFAULT_RETRIES_FOR_PARTIAL_TX_CREATION {
let params = tx_params(mortality, nonce as u64, tip);
match sink.api().tx().create_partial(&tx_call, from_account_id, params.into()).await {
Ok(tx) =>
return subxt_transaction(sink, tx, from_keypair, nonce, mortality, account).await,
Ok(tx) => {
return subxt_transaction(sink, tx, from_keypair, nonce, mortality, account).await
},
Err(_) => continue,
}
}
bizinikiwi/utils/txtesttool/src/transaction.rs
+4 -4
View File
@@ -9,15 +9,15 @@ use crate::{
helpers::StreamOf,
runner::DefaultTxTask,
subxt_transaction::{
build_subxt_tx, EthPayloadBuilderFn, EthRuntimeConfig, EthTransaction, EthTransactionsSink,
HashOf, SubPayloadBuilderFn, BizinikiwTransaction, BizinikiwTransactionsSink,
build_subxt_tx, BizinikiwTransaction, BizinikiwTransactionsSink, EthPayloadBuilderFn,
EthRuntimeConfig, EthTransaction, EthTransactionsSink, HashOf, SubPayloadBuilderFn,
},
};
use async_trait::async_trait;
use serde::{Deserialize, Serialize};
use std::any::Any;
use pezkuwi_subxt::{tx::TxStatus, OnlineClient, PezkuwiConfig};
use pezkuwi_subxt_core::config::Hash as BlockHash;
use serde::{Deserialize, Serialize};
use std::any::Any;
/// Parameters for building a transaction.
pub(crate) struct BuildTransactionParams<'a> {