Merge pull request #489 from onflow/fxamacker/avoid-using-unexported-…

…map-fields-in-tests

Avoid using unexported `OrderedMap` fields in tests

array_test.go

@@ -2830,7 +2830,7 @@ func TestArrayWithChildArrayMap(t *testing.T) {
 			require.NoError(t, err)
 			require.Nil(t, storable)
 
-			require.True(t, childMap.root.IsData())
+			require.True(t, IsMapRootDataSlab(childMap))
 
 			err = array.Append(childMap)
 			require.NoError(t, err)
@@ -2871,7 +2871,7 @@ func TestArrayWithChildArrayMap(t *testing.T) {
 				expectedChildMapValues[k] = v
 			}
 
-			require.False(t, childMap.root.IsData())
+			require.False(t, IsMapRootDataSlab(childMap))
 
 			err = array.Append(childMap)
 			require.NoError(t, err)

export_test.go

@@ -38,3 +38,9 @@ var (
 	ArrayHasParentUpdater            = (*Array).hasParentUpdater
 	GetArrayMutableElementIndexCount = (*Array).getMutableElementIndexCount
 )
+
+// Exported function of OrderedMap for testing.
+var (
+	GetMapRootSlab        = (*OrderedMap).rootSlab
+	GetMapDigesterBuilder = (*OrderedMap).getDigesterBuilder
+)

map.go

@@ -4883,6 +4883,14 @@ func (m *OrderedMap) setParentUpdater(f parentUpdater) {
 	m.parentUpdater = f
 }
 
+func (m *OrderedMap) rootSlab() MapSlab {
+	return m.root
+}
+
+func (m *OrderedMap) getDigesterBuilder() DigesterBuilder {
+	return m.digesterBuilder
+}
+
 // setCallbackWithChild sets up callback function with child value (child)
 // so parent map (m) can be notified when child value is modified.
 func (m *OrderedMap) setCallbackWithChild(