pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 09:21:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply some clippy lints (#11154)

Browse Source 
* Apply some clippy hints

* Revert clippy ci changes

* Update client/cli/src/commands/generate.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/cli/src/commands/inspect_key.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/db/src/bench.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/db/src/bench.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/block_rules.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/block_rules.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/network/src/transactions.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/network/src/protocol.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Revert due to missing `or_default` function.

* Fix compilation and simplify code

* Undo change that corrupts benchmark.

* fix clippy

* Update client/service/test/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/state-db/src/noncanonical.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/state-db/src/noncanonical.rs

remove leftovers!

* Update client/tracing/src/logging/directives.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/fork-tree/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* added needed ref

* Update frame/referenda/src/benchmarking.rs

* Simplify byte-vec creation

* let's just not overlap the ranges

* Correction

* cargo fmt

* Update utils/frame/benchmarking-cli/src/shared/stats.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/frame/benchmarking-cli/src/pallet/command.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/frame/benchmarking-cli/src/pallet/command.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Giles Cope <gilescope@gmail.com>
This commit is contained in:
Falco Hirschenberger
2022-04-30 23:28:27 +02:00
committed by GitHub
parent a990473cf9
commit b581604aa7
368 changed files with 1927 additions and 2236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/transaction-pool/src/api.rs
+6 -6
View File
@@ -123,7 +123,7 @@ where
type BodyFuture = Ready<error::Result<Option<Vec<<Self::Block as BlockT>::Extrinsic>>>>;
fn block_body(&self, id: &BlockId<Self::Block>) -> Self::BodyFuture {
ready(self.client.block_body(&id).map_err(|e| error::Error::from(e)))
ready(self.client.block_body(id).map_err(error::Error::from))
}
fn validate_transaction(
@@ -134,7 +134,7 @@ where
) -> Self::ValidationFuture {
let (tx, rx) = oneshot::channel();
let client = self.client.clone();
let at = at.clone();
let at = *at;
let validation_pool = self.validation_pool.clone();
let metrics = self.metrics.clone();
@@ -212,7 +212,7 @@ where
let runtime_api = client.runtime_api();
let api_version = sp_tracing::within_span! { sp_tracing::Level::TRACE, "check_version";
runtime_api
.api_version::<dyn TaggedTransactionQueue<Block>>(&at)
.api_version::<dyn TaggedTransactionQueue<Block>>(at)
.map_err(|e| Error::RuntimeApi(e.to_string()))?
.ok_or_else(|| Error::RuntimeApi(
format!("Could not find `TaggedTransactionQueue` api for block `{:?}`.", at)
@@ -229,7 +229,7 @@ where
sp_tracing::Level::TRACE, "runtime::validate_transaction";
{
if api_version >= 3 {
runtime_api.validate_transaction(&at, source, uxt, block_hash)
runtime_api.validate_transaction(at, source, uxt, block_hash)
.map_err(|e| Error::RuntimeApi(e.to_string()))
} else {
let block_number = client.to_number(at)
@@ -249,11 +249,11 @@ where
if api_version == 2 {
#[allow(deprecated)] // old validate_transaction
runtime_api.validate_transaction_before_version_3(&at, source, uxt)
runtime_api.validate_transaction_before_version_3(at, source, uxt)
.map_err(|e| Error::RuntimeApi(e.to_string()))
} else {
#[allow(deprecated)] // old validate_transaction
runtime_api.validate_transaction_before_version_2(&at, uxt)
runtime_api.validate_transaction_before_version_2(at, uxt)
.map_err(|e| Error::RuntimeApi(e.to_string()))
}
}
substrate/client/transaction-pool/src/graph/pool.rs
+1 -1
View File
@@ -335,7 +335,7 @@ impl<B: ChainApi> Pool<B> {
// And finally - submit reverified transactions back to the pool
self.validated_pool.resubmit_pruned(
&at,
at,
known_imported_hashes,
pruned_hashes,
reverified_transactions.into_iter().map(|(_, xt)| xt).collect(),
substrate/client/transaction-pool/src/graph/ready.rs
+3 -3
View File
@@ -300,7 +300,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
for tag in &tx.transaction.transaction.requires {
if let Some(hash) = self.provided_tags.get(tag) {
if let Some(tx) = ready.get_mut(hash) {
remove_item(&mut tx.unlocks, &hash);
remove_item(&mut tx.unlocks, hash);
}
}
}
@@ -351,7 +351,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
let mut ready = self.ready.write();
let mut find_previous = |tag| -> Option<Vec<Tag>> {
let prev_hash = self.provided_tags.get(tag)?;
let tx2 = ready.get_mut(&prev_hash)?;
let tx2 = ready.get_mut(prev_hash)?;
remove_item(&mut tx2.unlocks, hash);
// We eagerly prune previous transactions as well.
// But it might not always be good.
@@ -551,7 +551,7 @@ impl<Hash: hash::Hash + Member, Ex> Iterator for BestIterator<Hash, Ex> {
continue
}
let ready = match self.all.get(&hash).cloned() {
let ready = match self.all.get(hash).cloned() {
Some(ready) => ready,
// The transaction is not in all, maybe it was removed in the meantime?
None => continue,
substrate/client/transaction-pool/src/graph/validated_pool.rs
+7 -11
View File
@@ -442,7 +442,7 @@ impl<B: ChainApi> ValidatedPool<B> {
pub fn extrinsics_tags(&self, hashes: &[ExtrinsicHash<B>]) -> Vec<Option<Vec<Tag>>> {
self.pool
.read()
.by_hashes(&hashes)
.by_hashes(hashes)
.into_iter()
.map(|existing_in_pool| {
existing_in_pool.map(|transaction| transaction.provides.to_vec())
@@ -546,7 +546,7 @@ impl<B: ChainApi> ValidatedPool<B> {
let now = Instant::now();
let to_remove = {
self.ready()
.filter(|tx| self.rotator.ban_if_stale(&now, block_number, &tx))
.filter(|tx| self.rotator.ban_if_stale(&now, block_number, tx))
.map(|tx| tx.hash)
.collect::<Vec<_>>()
};
@@ -554,7 +554,7 @@ impl<B: ChainApi> ValidatedPool<B> {
let p = self.pool.read();
let mut hashes = Vec::new();
for tx in p.futures() {
if self.rotator.ban_if_stale(&now, block_number, &tx) {
if self.rotator.ban_if_stale(&now, block_number, tx) {
hashes.push(tx.hash);
}
}
@@ -630,11 +630,7 @@ impl<B: ChainApi> ValidatedPool<B> {
/// Returns a Vec of hashes and extrinsics in the future pool.
pub fn futures(&self) -> Vec<(ExtrinsicHash<B>, ExtrinsicFor<B>)> {
self.pool
.read()
.futures()
.map(|tx| (tx.hash.clone(), tx.data.clone()))
.collect()
self.pool.read().futures().map(|tx| (tx.hash, tx.data.clone())).collect()
}
/// Returns pool status.
@@ -663,9 +659,9 @@ where
match *imported {
base::Imported::Ready { ref promoted, ref failed, ref removed, ref hash } => {
listener.ready(hash, None);
failed.into_iter().for_each(|f| listener.invalid(f));
removed.into_iter().for_each(|r| listener.dropped(&r.hash, Some(hash)));
promoted.into_iter().for_each(|p| listener.ready(p, None));
failed.iter().for_each(|f| listener.invalid(f));
removed.iter().for_each(|r| listener.dropped(&r.hash, Some(hash)));
promoted.iter().for_each(|p| listener.ready(p, None));
},
base::Imported::Future { ref hash } => listener.future(hash),
}
substrate/client/transaction-pool/src/lib.rs
+8 -9
View File
@@ -430,7 +430,7 @@ where
let validated = ValidatedTransaction::valid_at(
block_number.saturated_into::<u64>(),
hash.clone(),
hash,
TransactionSource::Local,
xt,
bytes,
@@ -538,7 +538,7 @@ async fn prune_known_txs_for_block<Block: BlockT, Api: graph::ChainApi<Block = B
})
.unwrap_or_default();
let hashes = extrinsics.iter().map(|tx| pool.hash_of(&tx)).collect::<Vec<_>>();
let hashes = extrinsics.iter().map(|tx| pool.hash_of(tx)).collect::<Vec<_>>();
log::trace!(target: "txpool", "Pruning transactions: {:?}", hashes);
@@ -609,11 +609,11 @@ where
if let Some(ref tree_route) = tree_route {
for retracted in tree_route.retracted() {
// notify txs awaiting finality that it has been retracted
pool.validated_pool().on_block_retracted(retracted.hash.clone());
pool.validated_pool().on_block_retracted(retracted.hash);
}
future::join_all(tree_route.enacted().iter().map(|h| {
prune_known_txs_for_block(BlockId::Hash(h.hash.clone()), &*api, &*pool)
prune_known_txs_for_block(BlockId::Hash(h.hash), &*api, &*pool)
}))
.await
.into_iter()
@@ -622,7 +622,7 @@ where
})
}
pruned_log.extend(prune_known_txs_for_block(id.clone(), &*api, &*pool).await);
pruned_log.extend(prune_known_txs_for_block(id, &*api, &*pool).await);
metrics.report(|metrics| {
metrics.block_transactions_pruned.inc_by(pruned_log.len() as u64)
@@ -632,7 +632,7 @@ where
let mut resubmit_transactions = Vec::new();
for retracted in tree_route.retracted() {
let hash = retracted.hash.clone();
let hash = retracted.hash;
let block_transactions = api
.block_body(&BlockId::hash(hash))
@@ -649,7 +649,7 @@ where
resubmit_transactions.extend(block_transactions.into_iter().filter(
|tx| {
let tx_hash = pool.hash_of(&tx);
let tx_hash = pool.hash_of(tx);
let contains = pruned_log.contains(&tx_hash);
// need to count all transactions, not just filtered, here
@@ -699,8 +699,7 @@ where
});
if next_action.revalidate {
let hashes =
pool.validated_pool().ready().map(|tx| tx.hash.clone()).collect();
let hashes = pool.validated_pool().ready().map(|tx| tx.hash).collect();
revalidation_queue.revalidate_later(block_number, hashes).await;
revalidation_strategy.lock().clear();
substrate/client/transaction-pool/src/revalidation.rs
+4 -4
View File
@@ -92,7 +92,7 @@ async fn batch_revalidate<Api: ChainApi>(
},
Ok(Ok(validity)) => {
revalidated.insert(
ext_hash.clone(),
ext_hash,
ValidatedTransaction::valid_at(
at.saturated_into::<u64>(),
ext_hash,
@@ -194,14 +194,14 @@ impl<Api: ChainApi> RevalidationWorker<Api> {
self.block_ordered
.entry(block_number)
.and_modify(|value| {
value.insert(ext_hash.clone());
value.insert(ext_hash);
})
.or_insert_with(|| {
let mut bt = HashSet::new();
bt.insert(ext_hash.clone());
bt.insert(ext_hash);
bt
});
self.members.insert(ext_hash.clone(), block_number);
self.members.insert(ext_hash, block_number);
}
}