-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added workaround trait for compiler bug
- Loading branch information
Showing
3 changed files
with
43 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,32 @@ | ||
#[cfg(feature = "runtime")] | ||
use crate::traits::ExtendedHeader; | ||
#[cfg(feature = "runtime")] | ||
use sp_runtime::{ | ||
traits::{Block, Header}, | ||
Digest, | ||
}; | ||
|
||
/// Extended block trait that extends Block to include ExtendedHeader in the header | ||
#[cfg(feature = "runtime")] | ||
pub trait ExtendedBlock<Extension>: Block { | ||
type Header: Header<Hash = Self::Hash> | ||
/// Extended Block trait that extends substrate primitive Block to include ExtendedHeader in the header | ||
pub trait ExtendedBlock<Extension>: | ||
Block | ||
+ DaHeaderProvider< | ||
<<Self as Block>::Header as Header>::Number, | ||
<<Self as Block>::Header as Header>::Hash, | ||
Digest, | ||
Extension, | ||
DaHeader = <Self as ExtendedBlock<Extension>>::DaHeader, | ||
> | ||
{ | ||
type DaHeader: Header<Hash = Self::Hash> | ||
+ ExtendedHeader< | ||
<<Self as Block>::Header as Header>::Number, | ||
<<Self as Block>::Header as Header>::Hash, | ||
Digest, | ||
Extension, | ||
>; | ||
} | ||
|
||
// Note: This is a workaround for a compiler bug (https://github.com/rust-lang/rust/issues/96634) | ||
// and should be removed when the compiler bug is fixed. | ||
pub trait DaHeaderProvider<Number, Hash, Digest, Extension> { | ||
/// DaHeader type. | ||
type DaHeader: ExtendedHeader<Number, Hash, Digest, Extension>; | ||
} |