@openzeppelin/upgrades-core 1.12.0 → 1.14.0

package/src/storage.test.ts.md

@@ -13,41 +13,59 @@ Generated by [AVA](https://avajs.dev).
         {
           contract: 'Storage1',
           label: 'u1',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '0',
           src: 'file.sol:1',
           type: 't_uint256',
         },
         {
           contract: 'Storage1',
           label: 'a1',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '1',
           src: 'file.sol:1',
           type: 't_address',
         },
         {
           contract: 'Storage1',
           label: 'm1',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '2',
           src: 'file.sol:1',
           type: 't_mapping(t_uint256,t_uint256)',
         },
         {
           contract: 'Storage1',
           label: 'us1',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '3',
           src: 'file.sol:1',
           type: 't_array(t_uint256)3_storage',
         },
       ],
       types: [
         [
-          't_uint256',
+          't_address',
           {
-            label: 'uint256',
+            label: 'address',
             members: undefined,
+            numberOfBytes: '20',
           },
         ],
         [
-          't_address',
+          't_array(t_uint256)3_storage',
           {
-            label: 'address',
+            label: 'uint256[3]',
             members: undefined,
+            numberOfBytes: '96',
           },
         ],
         [
@@ -55,13 +73,15 @@ Generated by [AVA](https://avajs.dev).
           {
             label: 'mapping(uint256 => uint256)',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_array(t_uint256)3_storage',
+          't_uint256',
           {
-            label: 'uint256[3]',
+            label: 'uint256',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
       ],
@@ -76,335 +96,505 @@ Generated by [AVA](https://avajs.dev).
         {
           contract: 'Storage2',
           label: 'my_public_uint256',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '0',
           src: 'file.sol:1',
           type: 't_uint256',
         },
         {
           contract: 'Storage2',
           label: 'my_internal_string',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '1',
           src: 'file.sol:1',
           type: 't_string_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_private_uint8',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '2',
           src: 'file.sol:1',
           type: 't_uint8',
         },
         {
           contract: 'Storage2',
           label: 'my_private_uint16',
+          offset: 1,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '2',
           src: 'file.sol:1',
           type: 't_int8',
         },
         {
           contract: 'Storage2',
           label: 'my_private_bool',
+          offset: 2,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '2',
           src: 'file.sol:1',
           type: 't_bool',
         },
         {
           contract: 'Storage2',
           label: 'my_private_uint',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '3',
           src: 'file.sol:1',
           type: 't_uint256',
         },
         {
           contract: 'Storage2',
           label: 'my_private_address',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '4',
           src: 'file.sol:1',
           type: 't_address',
         },
         {
           contract: 'Storage2',
           label: 'my_bytes',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '5',
           src: 'file.sol:1',
           type: 't_bytes_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_bytes8',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '6',
           src: 'file.sol:1',
           type: 't_bytes8',
         },
         {
           contract: 'Storage2',
           label: 'my_bytes32',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '7',
           src: 'file.sol:1',
           type: 't_bytes32',
         },
         {
           contract: 'Storage2',
           label: 'my_public_uint256_dynarray',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '8',
           src: 'file.sol:1',
           type: 't_array(t_uint256)dyn_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_internal_string_dynarray',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '9',
           src: 'file.sol:1',
           type: 't_array(t_string_storage)dyn_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_private_address_dynarray',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '10',
           src: 'file.sol:1',
           type: 't_array(t_address)dyn_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_public_int8_staticarray',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '11',
           src: 'file.sol:1',
           type: 't_array(t_int8)10_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_internal_bool_staticarray',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '12',
           src: 'file.sol:1',
           type: 't_array(t_bool)20_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_private_uint_staticarray',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '13',
           src: 'file.sol:1',
           type: 't_array(t_uint256)30_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_mapping',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '43',
           src: 'file.sol:1',
           type: 't_mapping(t_uint256,t_string_storage)',
         },
         {
           contract: 'Storage2',
           label: 'my_nested_mapping',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '44',
           src: 'file.sol:1',
           type: 't_mapping(t_uint256,t_mapping(t_string_memory_ptr,t_address))',
         },
         {
           contract: 'Storage2',
           label: 'my_mapping_with_arrays',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '45',
           src: 'file.sol:1',
           type: 't_mapping(t_uint256,t_array(t_bool)dyn_storage)',
         },
         {
           contract: 'Storage2',
           label: 'my_fun',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '46',
           src: 'file.sol:1',
           type: 't_function_internal_nonpayable(t_uint256)returns()',
         },
         {
           contract: 'Storage2',
           label: 'my_fun_dynarray',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '47',
           src: 'file.sol:1',
           type: 't_array(t_function_internal_nonpayable(t_string_memory_ptr,t_string_memory_ptr)returns())dyn_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_fun_staticarray',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '48',
           src: 'file.sol:1',
           type: 't_array(t_function_internal_nonpayable(t_uint256)returns(t_address))10_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_fun_mapping',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '51',
           src: 'file.sol:1',
           type: 't_mapping(t_uint256,t_function_internal_nonpayable(t_bool)returns())',
         },
         {
           contract: 'Storage2',
           label: 'my_contract',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '52',
           src: 'file.sol:1',
           type: 't_contract(Storage2)',
         },
         {
           contract: 'Storage2',
           label: 'my_contract_dynarray',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '53',
           src: 'file.sol:1',
           type: 't_array(t_contract(Storage2))dyn_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_contract_staticarray',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '54',
           src: 'file.sol:1',
           type: 't_array(t_contract(Storage2))10_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_contract_mapping',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '64',
           src: 'file.sol:1',
           type: 't_mapping(t_uint256,t_contract(Storage2))',
         },
         {
           contract: 'Storage2',
           label: 'my_contract_dynarray_mapping',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '65',
           src: 'file.sol:1',
           type: 't_mapping(t_uint256,t_array(t_contract(Storage2))dyn_storage)',
         },
         {
           contract: 'Storage2',
           label: 'my_contract_staticarray_mapping',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '66',
           src: 'file.sol:1',
           type: 't_mapping(t_uint256,t_array(t_contract(Storage2))10_storage)',
         },
         {
           contract: 'Storage2',
           label: 'my_struct',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '67',
           src: 'file.sol:1',
           type: 't_struct(MyStruct)storage',
         },
         {
           contract: 'Storage2',
           label: 'my_struct_dynarray',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '70',
           src: 'file.sol:1',
           type: 't_array(t_struct(MyStruct)storage)dyn_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_struct_staticarray',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '71',
           src: 'file.sol:1',
           type: 't_array(t_struct(MyStruct)storage)10_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_struct_mapping',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '101',
           src: 'file.sol:1',
           type: 't_mapping(t_uint256,t_struct(MyStruct)storage)',
         },
         {
           contract: 'Storage2',
           label: 'my_enum',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '102',
           src: 'file.sol:1',
           type: 't_enum(MyEnum)',
         },
         {
           contract: 'Storage2',
           label: 'my_enum_dynarray',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '103',
           src: 'file.sol:1',
           type: 't_array(t_enum(MyEnum))dyn_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_enum_staticarray',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '104',
           src: 'file.sol:1',
           type: 't_array(t_enum(MyEnum))10_storage',
         },
         {
           contract: 'Storage2',
           label: 'my_enum_mapping',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '105',
           src: 'file.sol:1',
           type: 't_mapping(t_uint256,t_enum(MyEnum))',
         },
         {
           contract: 'Storage2',
           label: 'my_complex_struct',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '106',
           src: 'file.sol:1',
           type: 't_struct(MyComplexStruct)storage',
         },
         {
           contract: 'Storage2',
           label: 'my_other_struct',
+          offset: 0,
+          renamedFrom: undefined,
+          retypedFrom: undefined,
+          slot: '111',
           src: 'file.sol:1',
           type: 't_struct(MyStruct)storage',
         },
       ],
       types: [
         [
-          't_uint256',
+          't_address',
           {
-            label: 'uint256',
+            label: 'address',
             members: undefined,
+            numberOfBytes: '20',
           },
         ],
         [
-          't_string_storage',
+          't_array(t_address)dyn_storage',
           {
-            label: 'string',
+            label: 'address[]',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_uint8',
+          't_array(t_bool)20_storage',
           {
-            label: 'uint8',
+            label: 'bool[20]',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_int8',
+          't_array(t_bool)dyn_storage',
           {
-            label: 'int8',
+            label: 'bool[]',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_bool',
+          't_array(t_contract(Storage2))10_storage',
           {
-            label: 'bool',
+            label: 'contract Storage2[10]',
             members: undefined,
+            numberOfBytes: '320',
           },
         ],
         [
-          't_address',
+          't_array(t_contract(Storage2))dyn_storage',
           {
-            label: 'address',
+            label: 'contract Storage2[]',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_bytes_storage',
+          't_array(t_enum(MyEnum))10_storage',
           {
-            label: 'bytes',
+            label: 'enum Storage2.MyEnum[10]',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_bytes8',
+          't_array(t_enum(MyEnum))dyn_storage',
           {
-            label: 'bytes8',
+            label: 'enum Storage2.MyEnum[]',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_bytes32',
+          't_array(t_function_internal_nonpayable(t_string_memory_ptr,t_string_memory_ptr)returns())dyn_storage',
           {
-            label: 'bytes32',
+            label: 'function (string,string)[]',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_array(t_uint256)dyn_storage',
+          't_array(t_function_internal_nonpayable(t_uint256)returns(t_address))10_storage',
           {
-            label: 'uint256[]',
+            label: 'function (uint256) returns (address)[10]',
             members: undefined,
+            numberOfBytes: '96',
           },
         ],
         [
-          't_array(t_string_storage)dyn_storage',
+          't_array(t_int8)10_storage',
           {
-            label: 'string[]',
+            label: 'int8[10]',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_array(t_address)dyn_storage',
+          't_array(t_string_storage)dyn_storage',
           {
-            label: 'address[]',
+            label: 'string[]',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_array(t_int8)10_storage',
+          't_array(t_struct(MyStruct)storage)10_storage',
           {
-            label: 'int8[10]',
+            label: 'struct Storage2.MyStruct[10]',
             members: undefined,
+            numberOfBytes: '960',
           },
         ],
         [
-          't_array(t_bool)20_storage',
+          't_array(t_struct(MyStruct)storage)dyn_storage',
           {
-            label: 'bool[20]',
+            label: 'struct Storage2.MyStruct[]',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
@@ -412,118 +602,138 @@ Generated by [AVA](https://avajs.dev).
           {
             label: 'uint256[30]',
             members: undefined,
+            numberOfBytes: '960',
           },
         ],
         [
-          't_mapping(t_uint256,t_string_storage)',
+          't_array(t_uint256)dyn_storage',
           {
-            label: 'mapping(uint256 => string)',
+            label: 'uint256[]',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_mapping(t_uint256,t_mapping(t_string_memory_ptr,t_address))',
+          't_bool',
           {
-            label: 'mapping(uint256 => mapping(string => address))',
+            label: 'bool',
             members: undefined,
+            numberOfBytes: '1',
           },
         ],
         [
-          't_mapping(t_string_memory_ptr,t_address)',
+          't_bytes32',
           {
-            label: 'mapping(string => address)',
+            label: 'bytes32',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_mapping(t_uint256,t_array(t_bool)dyn_storage)',
+          't_bytes8',
           {
-            label: 'mapping(uint256 => bool[])',
+            label: 'bytes8',
             members: undefined,
+            numberOfBytes: '8',
           },
         ],
         [
-          't_array(t_bool)dyn_storage',
+          't_bytes_storage',
           {
-            label: 'bool[]',
+            label: 'bytes',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_function_internal_nonpayable(t_uint256)returns()',
+          't_contract(Storage2)',
           {
-            label: 'function (uint256)',
+            label: 'contract Storage2',
             members: undefined,
+            numberOfBytes: '20',
           },
         ],
         [
-          't_array(t_function_internal_nonpayable(t_string_memory_ptr,t_string_memory_ptr)returns())dyn_storage',
+          't_enum(MyEnum)',
           {
-            label: 'function (string,string)[]',
-            members: undefined,
+            label: 'enum Storage2.MyEnum',
+            members: [
+              'State1',
+              'State2',
+            ],
+            numberOfBytes: '1',
           },
         ],
         [
-          't_function_internal_nonpayable(t_string_memory_ptr,t_string_memory_ptr)returns()',
+          't_function_internal_nonpayable(t_bool)returns()',
           {
-            label: 'function (string,string)',
+            label: 'function (bool)',
             members: undefined,
+            numberOfBytes: '8',
           },
         ],
         [
-          't_array(t_function_internal_nonpayable(t_uint256)returns(t_address))10_storage',
+          't_function_internal_nonpayable(t_string_memory_ptr,t_string_memory_ptr)returns()',
           {
-            label: 'function (uint256) returns (address)[10]',
+            label: 'function (string,string)',
             members: undefined,
+            numberOfBytes: '8',
           },
         ],
         [
-          't_function_internal_nonpayable(t_uint256)returns(t_address)',
+          't_function_internal_nonpayable(t_uint256)returns()',
           {
-            label: 'function (uint256) returns (address)',
+            label: 'function (uint256)',
             members: undefined,
+            numberOfBytes: '8',
           },
         ],
         [
-          't_mapping(t_uint256,t_function_internal_nonpayable(t_bool)returns())',
+          't_function_internal_nonpayable(t_uint256)returns(t_address)',
           {
-            label: 'mapping(uint256 => function (bool))',
+            label: 'function (uint256) returns (address)',
             members: undefined,
+            numberOfBytes: '8',
           },
         ],
         [
-          't_function_internal_nonpayable(t_bool)returns()',
+          't_int8',
           {
-            label: 'function (bool)',
+            label: 'int8',
             members: undefined,
+            numberOfBytes: '1',
           },
         ],
         [
-          't_contract(Storage2)',
+          't_mapping(t_string_memory_ptr,t_address)',
           {
-            label: 'contract Storage2',
+            label: 'mapping(string => address)',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_array(t_contract(Storage2))dyn_storage',
+          't_mapping(t_string_memory_ptr,t_enum(MyEnum))',
           {
-            label: 'contract Storage2[]',
+            label: 'mapping(string => enum Storage2.MyEnum)',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_array(t_contract(Storage2))10_storage',
+          't_mapping(t_uint256,t_array(t_bool)dyn_storage)',
           {
-            label: 'contract Storage2[10]',
+            label: 'mapping(uint256 => bool[])',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_mapping(t_uint256,t_contract(Storage2))',
+          't_mapping(t_uint256,t_array(t_contract(Storage2))10_storage)',
           {
-            label: 'mapping(uint256 => contract Storage2)',
+            label: 'mapping(uint256 => contract Storage2[10])',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
@@ -531,85 +741,71 @@ Generated by [AVA](https://avajs.dev).
           {
             label: 'mapping(uint256 => contract Storage2[])',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_mapping(t_uint256,t_array(t_contract(Storage2))10_storage)',
+          't_mapping(t_uint256,t_contract(Storage2))',
           {
-            label: 'mapping(uint256 => contract Storage2[10])',
+            label: 'mapping(uint256 => contract Storage2)',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_struct(MyStruct)storage',
-          {
-            label: 'struct Storage2.MyStruct',
-            members: [
-              {
-                label: 'struct_uint256',
-                type: 't_uint256',
-              },
-              {
-                label: 'struct_string',
-                type: 't_string_storage',
-              },
-              {
-                label: 'struct_address',
-                type: 't_address',
-              },
-            ],
-          },
-        ],
-        [
-          't_array(t_struct(MyStruct)storage)dyn_storage',
+          't_mapping(t_uint256,t_enum(MyEnum))',
           {
-            label: 'struct Storage2.MyStruct[]',
+            label: 'mapping(uint256 => enum Storage2.MyEnum)',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_array(t_struct(MyStruct)storage)10_storage',
+          't_mapping(t_uint256,t_function_internal_nonpayable(t_bool)returns())',
           {
-            label: 'struct Storage2.MyStruct[10]',
+            label: 'mapping(uint256 => function (bool))',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_mapping(t_uint256,t_struct(MyStruct)storage)',
+          't_mapping(t_uint256,t_mapping(t_string_memory_ptr,t_address))',
           {
-            label: 'mapping(uint256 => struct Storage2.MyStruct)',
+            label: 'mapping(uint256 => mapping(string => address))',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_enum(MyEnum)',
+          't_mapping(t_uint256,t_string_storage)',
           {
-            label: 'enum Storage2.MyEnum',
-            members: [
-              'State1',
-              'State2',
-            ],
+            label: 'mapping(uint256 => string)',
+            members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_array(t_enum(MyEnum))dyn_storage',
+          't_mapping(t_uint256,t_struct(MyStruct)storage)',
           {
-            label: 'enum Storage2.MyEnum[]',
+            label: 'mapping(uint256 => struct Storage2.MyStruct)',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_array(t_enum(MyEnum))10_storage',
+          't_string_memory_ptr',
           {
-            label: 'enum Storage2.MyEnum[10]',
+            label: 'string',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
-          't_mapping(t_uint256,t_enum(MyEnum))',
+          't_string_storage',
           {
-            label: 'mapping(uint256 => enum Storage2.MyEnum)',
+            label: 'string',
             members: undefined,
+            numberOfBytes: '32',
           },
         ],
         [
@@ -619,24 +815,67 @@ Generated by [AVA](https://avajs.dev).
             members: [
               {
                 label: 'uint256_dynarray',
+                offset: 0,
+                slot: '0',
                 type: 't_array(t_uint256)dyn_storage',
               },
               {
                 label: 'mapping_enums',
+                offset: 0,
+                slot: '1',
                 type: 't_mapping(t_string_memory_ptr,t_enum(MyEnum))',
               },
               {
                 label: 'other_struct',
+                offset: 0,
+                slot: '2',
                 type: 't_struct(MyStruct)storage',
               },
             ],
+            numberOfBytes: '160',
           },
         ],
         [
-          't_mapping(t_string_memory_ptr,t_enum(MyEnum))',
+          't_struct(MyStruct)storage',
           {
-            label: 'mapping(string => enum Storage2.MyEnum)',
+            label: 'struct Storage2.MyStruct',
+            members: [
+              {
+                label: 'struct_uint256',
+                offset: 0,
+                slot: '0',
+                type: 't_uint256',
+              },
+              {
+                label: 'struct_string',
+                offset: 0,
+                slot: '1',
+                type: 't_string_storage',
+              },
+              {
+                label: 'struct_address',
+                offset: 0,
+                slot: '2',
+                type: 't_address',
+              },
+            ],
+            numberOfBytes: '96',
+          },
+        ],
+        [
+          't_uint256',
+          {
+            label: 'uint256',
+            members: undefined,
+            numberOfBytes: '32',
+          },
+        ],
+        [
+          't_uint8',
+          {
+            label: 'uint8',
             members: undefined,
+            numberOfBytes: '1',
           },
         ],
       ],