@@ -48,6 +48,7 @@ pub contract Test {
48
48
note_interface::NoteType ,
49
49
retrieved_note::RetrievedNote ,
50
50
},
51
+ state_vars::storage::Storage as _ ,
51
52
test::mocks::mock_struct::MockStruct ,
52
53
};
53
54
use dep::token_portal_content_hash_lib:: {
@@ -139,8 +140,7 @@ pub contract Test {
139
140
storage_slot : Field ,
140
141
) {
141
142
assert (
142
- storage_slot
143
- != aztec::state_vars::storage::Storage ::get_storage_slot (storage .example_constant ),
143
+ storage_slot != storage .example_constant .get_storage_slot (),
144
144
"this storage slot is reserved for example_constant" ,
145
145
);
146
146
@@ -156,8 +156,7 @@ pub contract Test {
156
156
#[private]
157
157
fn call_get_notes (storage_slot : Field , active_or_nullified : bool ) -> Field {
158
158
assert (
159
- storage_slot
160
- != aztec::state_vars::storage::Storage ::get_storage_slot (storage .example_constant ),
159
+ storage_slot != storage .example_constant .get_storage_slot (),
161
160
"this storage slot is reserved for example_constant" ,
162
161
);
163
162
@@ -177,8 +176,7 @@ pub contract Test {
177
176
#[private]
178
177
fn call_get_notes_many (storage_slot : Field , active_or_nullified : bool ) -> [Field ; 2 ] {
179
178
assert (
180
- storage_slot
181
- != aztec::state_vars::storage::Storage ::get_storage_slot (storage .example_constant ),
179
+ storage_slot != storage .example_constant .get_storage_slot (),
182
180
"this storage slot is reserved for example_constant" ,
183
181
);
184
182
@@ -195,8 +193,7 @@ pub contract Test {
195
193
196
194
unconstrained fn call_view_notes (storage_slot : Field , active_or_nullified : bool ) -> pub Field {
197
195
assert (
198
- storage_slot
199
- != aztec::state_vars::storage::Storage ::get_storage_slot (storage .example_constant ),
196
+ storage_slot != storage .example_constant .get_storage_slot (),
200
197
"this storage slot is reserved for example_constant" ,
201
198
);
202
199
@@ -215,8 +212,7 @@ pub contract Test {
215
212
active_or_nullified : bool ,
216
213
) -> pub [Field ; 2 ] {
217
214
assert (
218
- storage_slot
219
- != aztec::state_vars::storage::Storage ::get_storage_slot (storage .example_constant ),
215
+ storage_slot != storage .example_constant .get_storage_slot (),
220
216
"this storage slot is reserved for example_constant" ,
221
217
);
222
218
@@ -233,8 +229,7 @@ pub contract Test {
233
229
#[private]
234
230
fn call_destroy_note (storage_slot : Field ) {
235
231
assert (
236
- storage_slot
237
- != aztec::state_vars::storage::Storage ::get_storage_slot (storage .example_constant ),
232
+ storage_slot != storage .example_constant .get_storage_slot (),
238
233
"this storage slot is reserved for example_constant" ,
239
234
);
240
235
@@ -376,8 +371,7 @@ pub contract Test {
376
371
377
372
#[private]
378
373
fn emit_encrypted_logs_nested (value : Field , owner : AztecAddress , sender : AztecAddress ) {
379
- let mut storage_slot =
380
- aztec::state_vars::storage::Storage ::get_storage_slot (storage .example_constant ) + 1 ;
374
+ let mut storage_slot = storage .example_constant .get_storage_slot () + 1 ;
381
375
Test ::at (context .this_address ()).call_create_note (value , owner , sender , storage_slot ).call (
382
376
&mut context ,
383
377
);
0 commit comments