Update clippy now that redundant imports has been reverted

This commit is contained in:
Luke Parker
2024-04-23 04:31:27 -04:00
parent a25e6330bd
commit a41329c027
20 changed files with 46 additions and 46 deletions

View File

@@ -517,7 +517,7 @@ impl Bitcoin {
if witness.len() >= 2 {
let redeem_script = ScriptBuf::from_bytes(witness.last().unwrap().clone());
if Self::segwit_data_pattern(&redeem_script) == Some(true) {
data = witness[witness.len() - 2].clone(); // len() - 1 is the redeem_script
data.clone_from(&witness[witness.len() - 2]); // len() - 1 is the redeem_script
break;
}
}
@@ -731,9 +731,9 @@ impl Network for Bitcoin {
let data = Self::extract_serai_data(tx);
for output in &mut outputs {
if output.kind == OutputType::External {
output.data = data.clone();
output.data.clone_from(&data);
}
output.presumed_origin = presumed_origin.clone();
output.presumed_origin.clone_from(&presumed_origin);
}
}

View File

@@ -1,4 +1,4 @@
use core::{fmt::Debug, time::Duration};
use core::{fmt, time::Duration};
use std::{
sync::Arc,
collections::{HashSet, HashMap},
@@ -108,9 +108,10 @@ impl TryInto<Vec<u8>> for Address {
Ok(self.0.to_vec())
}
}
impl ToString for Address {
fn to_string(&self) -> String {
ethereum_serai::alloy_core::primitives::Address::from(self.0).to_string()
impl fmt::Display for Address {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
ethereum_serai::alloy_core::primitives::Address::from(self.0).fmt(f)
}
}
@@ -122,7 +123,7 @@ impl SignableTransaction for RouterCommand {
}
#[async_trait]
impl<D: Debug + Db> TransactionTrait<Ethereum<D>> for Transaction {
impl<D: fmt::Debug + Db> TransactionTrait<Ethereum<D>> for Transaction {
type Id = [u8; 32];
fn id(&self) -> Self::Id {
self.hash.0
@@ -155,7 +156,7 @@ impl Epoch {
}
#[async_trait]
impl<D: Debug + Db> Block<Ethereum<D>> for Epoch {
impl<D: fmt::Debug + Db> Block<Ethereum<D>> for Epoch {
type Id = [u8; 32];
fn id(&self) -> [u8; 32] {
self.end_hash
@@ -168,7 +169,7 @@ impl<D: Debug + Db> Block<Ethereum<D>> for Epoch {
}
}
impl<D: Debug + Db> Output<Ethereum<D>> for EthereumInInstruction {
impl<D: fmt::Debug + Db> Output<Ethereum<D>> for EthereumInInstruction {
type Id = [u8; 32];
fn kind(&self) -> OutputType {
@@ -281,7 +282,7 @@ impl EventualityTrait for Eventuality {
}
#[derive(Clone, Debug)]
pub struct Ethereum<D: Debug + Db> {
pub struct Ethereum<D: fmt::Debug + Db> {
// This DB is solely used to access the first key generated, as needed to determine the Router's
// address. Accordingly, all methods present are consistent to a Serai chain with a finalized
// first key (regardless of local state), and this is safe.
@@ -290,12 +291,12 @@ pub struct Ethereum<D: Debug + Db> {
deployer: Deployer,
router: Arc<RwLock<Option<Router>>>,
}
impl<D: Debug + Db> PartialEq for Ethereum<D> {
impl<D: fmt::Debug + Db> PartialEq for Ethereum<D> {
fn eq(&self, _other: &Ethereum<D>) -> bool {
true
}
}
impl<D: Debug + Db> Ethereum<D> {
impl<D: fmt::Debug + Db> Ethereum<D> {
pub async fn new(db: D, url: String) -> Self {
let provider = Arc::new(RootProvider::new(
ClientBuilder::default().transport(SimpleRequest::new(url), true),
@@ -360,7 +361,7 @@ impl<D: Debug + Db> Ethereum<D> {
}
#[async_trait]
impl<D: Debug + Db> Network for Ethereum<D> {
impl<D: fmt::Debug + Db> Network for Ethereum<D> {
type Curve = Secp256k1;
type Transaction = Transaction;