From 7f11fa536879d10d8c9e27b14ff89d1a59bee557 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Fri, 29 Nov 2024 15:50:12 +0100 Subject: [PATCH] chore: relax block impl bounds (#13013) --- crates/primitives-traits/src/block/body.rs | 1 + crates/primitives-traits/src/block/header.rs | 2 ++ crates/primitives-traits/src/block/mod.rs | 4 ++-- crates/primitives/src/block.rs | 5 ++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/crates/primitives-traits/src/block/body.rs b/crates/primitives-traits/src/block/body.rs index 7491c75faf..8b1b86a9fe 100644 --- a/crates/primitives-traits/src/block/body.rs +++ b/crates/primitives-traits/src/block/body.rs @@ -30,6 +30,7 @@ pub trait BlockBody: + MaybeSerde + MaybeArbitrary + MaybeSerdeBincodeCompat + + 'static { /// Ordered list of signed transactions as committed in block. type Transaction: SignedTransaction; diff --git a/crates/primitives-traits/src/block/header.rs b/crates/primitives-traits/src/block/header.rs index e03535dd30..6ac85d82ca 100644 --- a/crates/primitives-traits/src/block/header.rs +++ b/crates/primitives-traits/src/block/header.rs @@ -30,6 +30,7 @@ pub trait BlockHeader: + MaybeSerde + MaybeArbitrary + MaybeSerdeBincodeCompat + + 'static { } @@ -50,5 +51,6 @@ impl BlockHeader for T where + MaybeSerde + MaybeArbitrary + MaybeSerdeBincodeCompat + + 'static { } diff --git a/crates/primitives-traits/src/block/mod.rs b/crates/primitives-traits/src/block/mod.rs index 5b22ff590b..fcbf02a76c 100644 --- a/crates/primitives-traits/src/block/mod.rs +++ b/crates/primitives-traits/src/block/mod.rs @@ -41,10 +41,10 @@ pub trait Block: + MaybeArbitrary { /// Header part of the block. - type Header: BlockHeader + 'static; + type Header: BlockHeader; /// The block's body contains the transactions in the block. - type Body: BlockBody + Send + Sync + Unpin + 'static; + type Body: BlockBody; /// Create new block instance. fn new(header: Self::Header, body: Self::Body) -> Self; diff --git a/crates/primitives/src/block.rs b/crates/primitives/src/block.rs index c4905458c7..267464be09 100644 --- a/crates/primitives/src/block.rs +++ b/crates/primitives/src/block.rs @@ -457,9 +457,8 @@ where impl reth_primitives_traits::Block for SealedBlock where - H: reth_primitives_traits::BlockHeader + 'static, - B: reth_primitives_traits::BlockBody + 'static, - Self: Serialize + for<'a> Deserialize<'a>, + H: reth_primitives_traits::BlockHeader, + B: reth_primitives_traits::BlockBody, { type Header = H; type Body = B;