Minor tweaks suggested by clippy (#10673)

* Minor tweaks suggested by clippy

* Fix typo caused by last commit

* Apply review suggestions
This commit is contained in:
Nazar Mokrynskyi
2022-01-15 22:00:12 +02:00
committed by GitHub
parent a534274c6f
commit 0bca06a483
5 changed files with 27 additions and 35 deletions
@@ -179,13 +179,13 @@ impl TestApi {
/// Add a block to the internal state.
pub fn add_block(&self, block: Block, is_best_block: bool) {
let hash = block.header.hash();
let block_number = block.header.number().clone();
let block_number = block.header.number();
let mut chain = self.chain.write();
chain.block_by_hash.insert(hash, block.clone());
chain
.block_by_number
.entry(block_number)
.entry(*block_number)
.or_default()
.push((block, is_best_block.into()));
}
@@ -259,15 +259,13 @@ impl sc_transaction_pool::ChainApi for TestApi {
if !found_best {
return ready(Ok(Err(TransactionValidityError::Invalid(
InvalidTransaction::Custom(1),
)
.into())))
))))
}
},
Ok(None) =>
return ready(Ok(Err(TransactionValidityError::Invalid(
InvalidTransaction::Custom(2),
)
.into()))),
)))),
Err(e) => return ready(Err(e)),
}
@@ -283,9 +281,7 @@ impl sc_transaction_pool::ChainApi for TestApi {
};
if self.chain.read().invalid_hashes.contains(&self.hash_and_length(&uxt).0) {
return ready(Ok(Err(
TransactionValidityError::Invalid(InvalidTransaction::Custom(0)).into()
)))
return ready(Ok(Err(TransactionValidityError::Invalid(InvalidTransaction::Custom(0)))))
}
let mut validity =
@@ -312,7 +308,7 @@ impl sc_transaction_pool::ChainApi for TestApi {
at: &BlockId<Self::Block>,
) -> Result<Option<<Self::Block as BlockT>::Hash>, Error> {
Ok(match at {
generic::BlockId::Hash(x) => Some(x.clone()),
generic::BlockId::Hash(x) => Some(*x),
generic::BlockId::Number(num) =>
self.chain.read().block_by_number.get(num).and_then(|blocks| {
blocks.iter().find(|b| b.1.is_best()).map(|b| b.0.header().hash())
@@ -371,6 +367,6 @@ impl sp_blockchain::HeaderMetadata<Block> for TestApi {
pub fn uxt(who: AccountKeyring, nonce: Index) -> Extrinsic {
let dummy = codec::Decode::decode(&mut TrailingZeroInput::zeroes()).unwrap();
let transfer = Transfer { from: who.into(), to: dummy, nonce, amount: 1 };
let signature = transfer.using_encoded(|e| who.sign(e)).into();
let signature = transfer.using_encoded(|e| who.sign(e));
Extrinsic::Transfer { transfer, signature, exhaust_resources_when_not_first: false }
}