Refactor 3-clause for loop in array test & validation code

This commit refactored 3-clause for loops in array test and
validation code to improve maintainability by using:
- range over integers
- range over slices

NOTE: This change does not affect non-test code.

Author: fxamacker

array_bench_test.go

@@ -198,7 +198,7 @@ func setupArray(b *testing.B, r *rand.Rand, storage *atree.PersistentSlabStorage
 	array, err := atree.NewArray(storage, address, typeInfo)
 	require.NoError(b, err)
 
-	for i := 0; i < initialArrayCount; i++ {
+	for range initialArrayCount {
 		v := RandomValue(r)
 		err := array.Append(v)
 		require.NoError(b, err)
@@ -231,8 +231,8 @@ func benchmarkArrayGet(b *testing.B, initialArrayCount, numberOfOps int) {
 
 	b.StartTimer()
 
-	for i := 0; i < b.N; i++ {
-		for i := 0; i < numberOfOps; i++ {
+	for range b.N {
+		for range numberOfOps {
 			index := r.Intn(int(array.Count()))
 			value, _ = array.Get(uint64(index))
 		}
@@ -249,15 +249,15 @@ func benchmarkArrayInsert(b *testing.B, initialArrayCount, numberOfOps int) {
 
 	storage := newTestPersistentStorage(b)
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 
 		b.StopTimer()
 
 		array := setupArray(b, r, storage, initialArrayCount)
 
 		b.StartTimer()
 
-		for i := 0; i < numberOfOps; i++ {
+		for range numberOfOps {
 			index := r.Intn(int(array.Count()))
 			v := RandomValue(r)
 			_ = array.Insert(uint64(index), v)
@@ -273,15 +273,15 @@ func benchmarkArrayRemove(b *testing.B, initialArrayCount, numberOfOps int) {
 
 	storage := newTestPersistentStorage(b)
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 
 		b.StopTimer()
 
 		array := setupArray(b, r, storage, initialArrayCount)
 
 		b.StartTimer()
 
-		for i := 0; i < numberOfOps; i++ {
+		for range numberOfOps {
 			index := r.Intn(int(array.Count()))
 			_, _ = array.Remove(uint64(index))
 		}
@@ -298,7 +298,7 @@ func benchmarkArrayRemoveAll(b *testing.B, initialArrayCount int) {
 
 	var storable atree.Storable
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 
 		b.StopTimer()
 
@@ -324,7 +324,7 @@ func benchmarkArrayPopIterate(b *testing.B, initialArrayCount int) {
 
 	var storable atree.Storable
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 
 		b.StopTimer()
 
@@ -355,7 +355,7 @@ func benchmarkNewArrayFromAppend(b *testing.B, initialArrayCount int) {
 
 	b.StartTimer()
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		copied, _ := atree.NewArray(storage, array.Address(), array.Type())
 
 		_ = array.IterateReadOnly(func(value atree.Value) (bool, error) {
@@ -381,7 +381,7 @@ func benchmarkNewArrayFromBatchData(b *testing.B, initialArrayCount int) {
 
 	b.StartTimer()
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		iter, err := array.ReadOnlyIterator()
 		require.NoError(b, err)
 

array_benchmark_test.go

@@ -89,7 +89,7 @@ func benchmarkArray(b *testing.B, initialArrayCount, numberOfElements int) {
 	var totalLookupTime time.Duration
 
 	// setup
-	for i := 0; i < initialArrayCount; i++ {
+	for range initialArrayCount {
 		v := RandomValue(r)
 		storable, err := v.Storable(storage, array.Address(), atree.MaxInlineArrayElementSize())
 		require.NoError(b, err)
@@ -107,7 +107,7 @@ func benchmarkArray(b *testing.B, initialArrayCount, numberOfElements int) {
 	start = time.Now()
 	array, err = atree.NewArrayWithRootID(storage, arrayID)
 	require.NoError(b, err)
-	for i := 0; i < numberOfElements; i++ {
+	for range numberOfElements {
 		v := RandomValue(r)
 
 		storable, err := v.Storable(storage, array.Address(), atree.MaxInlineArrayElementSize())
@@ -127,7 +127,7 @@ func benchmarkArray(b *testing.B, initialArrayCount, numberOfElements int) {
 	array, err = atree.NewArrayWithRootID(storage, arrayID)
 	require.NoError(b, err)
 
-	for i := 0; i < numberOfElements; i++ {
+	for range numberOfElements {
 		ind := r.Intn(int(array.Count()))
 		storable, err := array.Remove(uint64(ind))
 		require.NoError(b, err)
@@ -142,7 +142,7 @@ func benchmarkArray(b *testing.B, initialArrayCount, numberOfElements int) {
 	array, err = atree.NewArrayWithRootID(storage, arrayID)
 	require.NoError(b, err)
 
-	for i := 0; i < numberOfElements; i++ {
+	for range numberOfElements {
 		ind := r.Intn(int(array.Count()))
 		v := RandomValue(r)
 
@@ -163,7 +163,7 @@ func benchmarkArray(b *testing.B, initialArrayCount, numberOfElements int) {
 	array, err = atree.NewArrayWithRootID(storage, arrayID)
 	require.NoError(b, err)
 
-	for i := 0; i < numberOfElements; i++ {
+	for range numberOfElements {
 		ind := r.Intn(int(array.Count()))
 		_, err := array.Get(uint64(ind))
 		require.NoError(b, err)
@@ -217,7 +217,7 @@ func benchmarkLongTermImpactOnMemory(b *testing.B, initialArrayCount, numberOfOp
 	var totalRawDataSize uint32
 
 	// setup
-	for i := 0; i < initialArrayCount; i++ {
+	for range initialArrayCount {
 		v := RandomValue(r)
 
 		storable, err := v.Storable(storage, array.Address(), atree.MaxInlineArrayElementSize())
@@ -231,7 +231,7 @@ func benchmarkLongTermImpactOnMemory(b *testing.B, initialArrayCount, numberOfOp
 	require.NoError(b, storage.Commit())
 	b.ResetTimer()
 
-	for i := 0; i < numberOfOps; i++ {
+	for range numberOfOps {
 		ind := r.Intn(int(array.Count()))
 		// select opt
 		switch r.Intn(2) {

array_serialization_verify.go

@@ -203,7 +203,7 @@ func (v *serializationVerifier) arrayDataSlabEqual(expected, actual *ArrayDataSl
 	}
 
 	// Compare element
-	for i := 0; i < len(expected.elements); i++ {
+	for i := range expected.elements {
 		ee := expected.elements[i]
 		ae := actual.elements[i]
 
@@ -408,7 +408,7 @@ func hasInlinedComposite(data []byte) (bool, error) {
 	if err != nil {
 		return false, NewDecodingError(err)
 	}
-	for i := uint64(0); i < extraDataCount; i++ {
+	for range extraDataCount {
 		tagNum, err := dec.DecodeTagNumber()
 		if err != nil {
 			return false, NewDecodingError(err)