Skip to content

Commit 4f57ecd

Browse files
committed
chore: rm deprecated types
1 parent b93d78b commit 4f57ecd

File tree

9 files changed

+15
-17
lines changed

9 files changed

+15
-17
lines changed

crates/evm/src/convert.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use alloy::{
44
consensus::{ReceiptEnvelope, TxEip1559},
5-
primitives::{Address, PrimitiveSignature as Signature, U256},
5+
primitives::{Address, Signature, U256},
66
sol_types::SolCall,
77
};
88
use reth::{

crates/evm/src/driver.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ use alloy::{
99
primitives::{Address, Bloom, U256},
1010
};
1111
use reth::{
12-
core::primitives::{SignedTransaction, SignerRecoverable},
12+
core::primitives::SignerRecoverable,
1313
primitives::{
14-
Block, BlockBody, Header, Receipt, RecoveredBlock, SealedHeader, Transaction,
15-
TransactionSigned, TxType,
14+
Block, BlockBody, Header, Receipt, RecoveredBlock, SealedHeader, TransactionSigned, TxType,
1615
},
1716
providers::ExecutionOutcome,
1817
revm::{

crates/extract/src/extracted.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ impl ExtractedEvent<'_, Zenith::BlockSubmitted> {
188188
}
189189

190190
/// True if the transaction is an EIP-4844 transaction.
191-
pub fn is_eip4844(&self) -> bool {
191+
pub const fn is_eip4844(&self) -> bool {
192192
self.tx.is_eip4844()
193193
}
194194
}

crates/rpc/src/ctx.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use alloy::{
1313
rpc::types::{FeeHistory, Filter, Log},
1414
};
1515
use reth::{
16-
core::primitives::{SignedTransaction, SignerRecoverable},
16+
core::primitives::SignerRecoverable,
1717
primitives::{Block, EthPrimitives, Receipt, Recovered, RecoveredBlock, TransactionSigned},
1818
providers::{
1919
providers::{BlockchainProvider, ProviderNodeTypes},
@@ -793,7 +793,7 @@ where
793793
append_matching_block_logs(
794794
&mut all_logs,
795795
ProviderOrBlock::<BlockchainProvider<Inner>>::Block(block),
796-
&filter,
796+
filter,
797797
block_num_hash,
798798
&receipts,
799799
false,

crates/rpc/src/receipts.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use alloy::consensus::{transaction::TransactionMeta, ReceiptEnvelope, TxReceipt}
55
use alloy::primitives::{Address, TxKind};
66
use alloy::rpc::types::eth::{Log, ReceiptWithBloom, TransactionReceipt};
77
use reth::core::primitives::SignerRecoverable;
8-
use reth::primitives::transaction::SignedTransaction;
98
use reth::primitives::{Receipt, TransactionSigned, TxType};
109
use reth::rpc::server_types::eth::{EthApiError, EthResult};
1110
use signet_types::MagicSig;

crates/types/src/magic_sig.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use alloy::primitives::{Address, PrimitiveSignature as Signature, B256};
1+
use alloy::primitives::{Address, Signature, B256};
22
use signet_zenith::MINTER_ADDRESS;
33

44
/// A sentinel value to identify the magic signature. This is encoded in the

crates/types/src/seq/mod.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ pub trait RequestSigner {
1111
fn sign_request(
1212
&self,
1313
request: &SignRequest,
14-
) -> impl std::future::Future<
15-
Output = Result<alloy::primitives::PrimitiveSignature, alloy::signers::Error>,
16-
> + Send;
14+
) -> impl std::future::Future<Output = Result<alloy::primitives::Signature, alloy::signers::Error>>
15+
+ Send;
1716
}
1817

1918
impl<T> RequestSigner for T
@@ -23,7 +22,7 @@ where
2322
async fn sign_request(
2423
&self,
2524
request: &SignRequest,
26-
) -> Result<alloy::primitives::PrimitiveSignature, alloy::signers::Error> {
25+
) -> Result<alloy::primitives::Signature, alloy::signers::Error> {
2726
let hash = request.signing_hash();
2827
self.sign_hash(&hash).await
2928
}

crates/types/src/seq/resp.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::SignRequest;
2-
use alloy::primitives::{Address, PrimitiveSignature, SignatureError};
2+
use alloy::primitives::{Address, Signature, SignatureError};
33
use serde::{Deserialize, Serialize};
44

55
/// A signature response from a [`RequestSigner`].
@@ -11,7 +11,7 @@ pub struct SignResponse {
1111
/// The request that was signed.
1212
pub req: SignRequest,
1313
/// The signature over that request.
14-
pub sig: PrimitiveSignature,
14+
pub sig: Signature,
1515
}
1616

1717
impl SignResponse {

crates/zenith/src/block.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,14 @@ where
224224
#[cfg(test)]
225225
mod test {
226226
use alloy::consensus::{Signed, TxEip1559};
227-
use alloy::primitives::{b256, bytes, Address, PrimitiveSignature, U256};
227+
use alloy::primitives::{b256, bytes, Address, U256};
228+
use alloy::signers::Signature;
228229

229230
use super::*;
230231

231232
#[test]
232233
fn encode_decode() {
233-
let sig = PrimitiveSignature::from_scalars_and_parity(
234+
let sig = Signature::from_scalars_and_parity(
234235
b256!("840cfc572845f5786e702984c2a582528cad4b49b2a10b9db1be7fca90058565"),
235236
b256!("25e7109ceb98168d95b09b18bbf6b685130e0562f233877d492b94eee0c5b6d1"),
236237
false,

0 commit comments

Comments
 (0)