Skip to content

fix(storage): update debug assertions in gen_array_impl and gen_struct_array_impl #3860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xrusowsky merged 1 commit into from
May 7, 2026
+13 −13
Merged

fix(storage): update debug assertions in gen_array_impl and gen_struct_array_impl #3860

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions crates/precompiles-macros/src/storable_primitives.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ fn gen_array_impl(config: &ArrayConfig) -> TokenStream {
type Handler = crate::storage::types::array::ArrayHandler<#elem_type, #array_size>;

fn handle(slot: ::alloy::primitives::U256, ctx: crate::storage::LayoutCtx, address: ::alloy::primitives::Address) -> Self::Handler {
debug_assert_eq!(ctx, crate::storage::LayoutCtx::FULL, "Arrays cannot be packed");
debug_assert!(ctx.is_full(), "Arrays can only use full-slot LayoutCtx (FULL or INIT)");
Self::Handler::new(slot, address)
}
}
Expand All @@ -384,9 +384,9 @@ fn gen_array_impl(config: &ArrayConfig) -> TokenStream {
impl crate::storage::Storable for [#elem_type; #array_size] {
#[inline]
fn load<S: crate::storage::StorageOps>(storage: &S, slot: ::alloy::primitives::U256, ctx: crate::storage::LayoutCtx) -> crate::error::Result<Self> {
debug_assert_eq!(
ctx, crate::storage::LayoutCtx::FULL,
"Arrays can only be loaded with LayoutCtx::FULL"
debug_assert!(
ctx.is_full(),
"Arrays can only be loaded with a full-slot LayoutCtx (FULL or INIT)"
);

use crate::storage::packing::{calc_element_slot, calc_element_offset, extract_from_word};
Expand All @@ -396,9 +396,9 @@ fn gen_array_impl(config: &ArrayConfig) -> TokenStream {

#[inline]
fn store<S: crate::storage::StorageOps>(&self, storage: &mut S, slot: ::alloy::primitives::U256, ctx: crate::storage::LayoutCtx) -> crate::error::Result<()> {
debug_assert_eq!(
ctx, crate::storage::LayoutCtx::FULL,
"Arrays can only be stored with LayoutCtx::FULL"
debug_assert!(
ctx.is_full(),
"Arrays can only be stored with a full-slot LayoutCtx (FULL or INIT)"
);

use crate::storage::packing::{calc_element_slot, calc_element_offset, insert_into_word};
Expand Down Expand Up @@ -674,19 +674,19 @@ fn gen_struct_array_impl(struct_type: &TokenStream, array_size: usize) -> TokenS
impl crate::storage::Storable for [#struct_type; #array_size] {
#[inline]
fn load<S: crate::storage::StorageOps>(storage: &S, slot: ::alloy::primitives::U256, ctx: crate::storage::LayoutCtx) -> crate::error::Result<Self> {
debug_assert_eq!(
ctx, crate::storage::LayoutCtx::FULL,
"Struct arrays can only be loaded with LayoutCtx::FULL"
debug_assert!(
ctx.is_full(),
"Struct arrays can only be loaded with a full-slot LayoutCtx (FULL or INIT)"
);
let base_slot = slot;
#load_impl
}

#[inline]
fn store<S: crate::storage::StorageOps>(&self, storage: &mut S, slot: ::alloy::primitives::U256, ctx: crate::storage::LayoutCtx) -> crate::error::Result<()> {
debug_assert_eq!(
ctx, crate::storage::LayoutCtx::FULL,
"Struct arrays can only be stored with LayoutCtx::FULL"
debug_assert!(
ctx.is_full(),
"Struct arrays can only be stored with a full-slot LayoutCtx (FULL or INIT)"
);
let base_slot = slot;
#store_impl
Expand Down
Loading