Skip to content

Commit

Permalink
feat(primitives): move attributes into primitives (#163)
Browse files Browse the repository at this point in the history
* feat(primitives): move attributes into primitives

Overview: migrate attributes from kona-derive types into kona-primitives

* feat(primtives): address nit in primitives lib.rs

Overview: Clean up lib.rs ordering
  • Loading branch information
N0xMare authored Apr 28, 2024
1 parent 4eab5e4 commit 963cdb8
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
5 changes: 2 additions & 3 deletions crates/derive/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
use crate::{
stages::NextAttributes,
traits::{OriginAdvancer, ResettableStage},
types::{
BlockInfo, L2AttributesWithParent, L2BlockInfo, StageError, StageResult, SystemConfig,
},
types::{StageError, StageResult},
};
use alloc::{boxed::Box, collections::VecDeque};
use async_trait::async_trait;
use core::fmt::Debug;
use kona_primitives::{BlockInfo, L2AttributesWithParent, L2BlockInfo, SystemConfig};

/// Provides the [BlockInfo] and [SystemConfig] for the stack to reset the stages.
#[async_trait]
Expand Down
3 changes: 0 additions & 3 deletions crates/derive/src/types/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
/// Re-export the kona primitives.
pub use kona_primitives::*;

mod attributes;
pub use attributes::{L2AttributesWithParent, L2PayloadAttributes};

pub mod batch;
pub use batch::{
Batch, BatchType, BatchValidity, BatchWithInclusionBlock, RawSpanBatch, SingleBatch, SpanBatch,
Expand Down
File renamed without changes.
3 changes: 3 additions & 0 deletions crates/primitives/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,8 @@ pub use payload::{
pub mod rollup_config;
pub use rollup_config::RollupConfig;

pub mod attributes;
pub use attributes::{L2AttributesWithParent, L2PayloadAttributes};

pub mod system_config;
pub use system_config::{SystemAccounts, SystemConfig, SystemConfigUpdateType};

0 comments on commit 963cdb8

Please sign in to comment.