Merge pull request #321 from onflow/fxamacker/add-id-to-array-and-ord…

…eredmap

Add `Array.ID()` and `OrderedMap.ID()`

array.go

@@ -2373,6 +2373,16 @@ func (a *Array) StorageID() StorageID {
 	return a.root.ID()
 }
 
+func (a *Array) ID() ID {
+	sid := a.StorageID()
+
+	var id ID
+	copy(id[:], sid.Address[:])
+	copy(id[8:], sid.Index[:])
+
+	return id
+}
+
 func (a *Array) Type() TypeInfo {
 	if extraData := a.root.ExtraData(); extraData != nil {
 		return extraData.TypeInfo

array_test.go

@@ -2589,3 +2589,18 @@ func errorCategorizationCount(err error) int {
 	}
 	return count
 }
+
+func TestArrayID(t *testing.T) {
+	typeInfo := testTypeInfo{42}
+	storage := newTestPersistentStorage(t)
+	address := Address{1, 2, 3, 4, 5, 6, 7, 8}
+
+	array, err := NewArray(storage, address, typeInfo)
+	require.NoError(t, err)
+
+	sid := array.StorageID()
+	id := array.ID()
+
+	require.Equal(t, sid.Address[:], id[:8])
+	require.Equal(t, sid.Index[:], id[8:])
+}

map.go

@@ -3862,6 +3862,16 @@ func (m *OrderedMap) StorageID() StorageID {
 	return m.root.Header().id
 }
 
+func (m *OrderedMap) ID() ID {
+	sid := m.StorageID()
+
+	var id ID
+	copy(id[:], sid.Address[:])
+	copy(id[8:], sid.Index[:])
+
+	return id
+}
+
 func (m *OrderedMap) StoredValue(_ SlabStorage) (Value, error) {
 	return m, nil
 }

map_test.go

@@ -4217,3 +4217,18 @@ func TestMaxInlineMapValueSize(t *testing.T) {
 		verifyMap(t, storage, typeInfo, address, m, keyValues, nil, false)
 	})
 }
+
+func TestMapID(t *testing.T) {
+	typeInfo := testTypeInfo{42}
+	storage := newTestPersistentStorage(t)
+	address := Address{1, 2, 3, 4, 5, 6, 7, 8}
+
+	m, err := NewMap(storage, address, newBasicDigesterBuilder(), typeInfo)
+	require.NoError(t, err)
+
+	sid := m.StorageID()
+	id := m.ID()
+
+	require.Equal(t, sid.Address[:], id[:8])
+	require.Equal(t, sid.Index[:], id[8:])
+}

storage.go

@@ -31,6 +31,8 @@ import (
 
 const LedgerBaseStorageSlabPrefix = "$"
 
+type ID [16]byte
+
 type (
 	Address      [8]byte
 	StorageIndex [8]byte