Skip to content

Commit 0f39b4e

Browse files
aaroncjulienrbrt
andauthored
chore(schema/testing): upgrade to go 1.23 iterators (#21282)
Co-authored-by: Julien Robert <julien@rbrt.fr>
1 parent 858ec2f commit 0f39b4e

3 files changed

Lines changed: 16 additions & 23 deletions

File tree

schema/testing/statesim/app_diff.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,29 @@ func DiffAppStates(expected, actual view.AppState) string {
2727
res += fmt.Sprintf("MODULE COUNT ERROR: expected %d, got %d\n", expectNumModules, actualNumModules)
2828
}
2929

30-
expected.Modules(func(expectedMod view.ModuleState, err error) bool {
30+
for expectedMod, err := range expected.Modules {
3131
if err != nil {
3232
res += fmt.Sprintf("ERROR getting expected module: %s\n", err)
33-
return true
33+
continue
3434
}
3535

3636
moduleName := expectedMod.ModuleName()
3737
actualMod, err := actual.GetModule(moduleName)
3838
if err != nil {
3939
res += fmt.Sprintf("ERROR getting actual module: %s\n", err)
40-
return true
40+
continue
4141
}
4242
if actualMod == nil {
4343
res += fmt.Sprintf("Module %s: actual module NOT FOUND\n", moduleName)
44-
return true
44+
continue
4545
}
4646

4747
diff := DiffModuleStates(expectedMod, actualMod)
4848
if diff != "" {
4949
res += "Module " + moduleName + "\n"
5050
res += indentAllLines(diff)
5151
}
52-
53-
return true
54-
})
52+
}
5553

5654
return res
5755
}

schema/testing/statesim/module_diff.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,29 @@ func DiffModuleStates(expected, actual view.ModuleState) string {
2727
res += fmt.Sprintf("OBJECT COLLECTION COUNT ERROR: expected %d, got %d\n", expectedNumObjectCollections, actualNumObjectCollections)
2828
}
2929

30-
expected.ObjectCollections(func(expectedColl view.ObjectCollection, err error) bool {
30+
for expectedColl, err := range expected.ObjectCollections {
3131
if err != nil {
3232
res += fmt.Sprintf("ERROR getting expected object collection: %s\n", err)
33-
return true
33+
continue
3434
}
3535

3636
objTypeName := expectedColl.ObjectType().Name
3737
actualColl, err := actual.GetObjectCollection(objTypeName)
3838
if err != nil {
3939
res += fmt.Sprintf("ERROR getting actual object collection: %s\n", err)
40-
return true
40+
continue
4141
}
4242
if actualColl == nil {
4343
res += fmt.Sprintf("Object Collection %s: actuall collection NOT FOUND\n", objTypeName)
44-
return true
44+
continue
4545
}
4646

4747
diff := DiffObjectCollections(expectedColl, actualColl)
4848
if diff != "" {
4949
res += "Object Collection " + objTypeName + "\n"
5050
res += indentAllLines(diff)
5151
}
52-
53-
return true
54-
})
52+
}
5553

5654
return res
5755
}

schema/testing/statesim/object_coll_diff.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"fmt"
55
"strings"
66

7-
"cosmossdk.io/schema"
87
schematesting "cosmossdk.io/schema/testing"
98
"cosmossdk.io/schema/view"
109
)
@@ -30,29 +29,29 @@ func DiffObjectCollections(expected, actual view.ObjectCollection) string {
3029
res += fmt.Sprintf("OBJECT COUNT ERROR: expected %d, got %d\n", expectedNumObjects, actualNumObjects)
3130
}
3231

33-
expected.AllState(func(expectedUpdate schema.ObjectUpdate, err error) bool {
32+
for expectedUpdate, err := range expected.AllState {
3433
if err != nil {
3534
res += fmt.Sprintf("ERROR getting expected object: %s\n", err)
36-
return true
35+
continue
3736
}
3837

3938
keyStr := fmtObjectKey(expected.ObjectType(), expectedUpdate.Key)
4039
actualUpdate, found, err := actual.GetObject(expectedUpdate.Key)
4140
if err != nil {
4241
res += fmt.Sprintf("Object %s: ERROR: %v\n", keyStr, err)
43-
return true
42+
continue
4443
}
4544
if !found {
4645
res += fmt.Sprintf("Object %s: NOT FOUND\n", keyStr)
47-
return true
46+
continue
4847
}
4948

5049
if expectedUpdate.Delete != actualUpdate.Delete {
5150
res += fmt.Sprintf("Object %s: Deleted mismatch, expected %v, got %v\n", keyStr, expectedUpdate.Delete, actualUpdate.Delete)
5251
}
5352

5453
if expectedUpdate.Delete {
55-
return true
54+
continue
5655
}
5756

5857
valueDiff := schematesting.DiffObjectValues(expected.ObjectType().ValueFields, expectedUpdate.Value, actualUpdate.Value)
@@ -62,9 +61,7 @@ func DiffObjectCollections(expected, actual view.ObjectCollection) string {
6261
res += "\n"
6362
res += indentAllLines(valueDiff)
6463
}
65-
66-
return true
67-
})
64+
}
6865

6966
return res
7067
}

0 commit comments

Comments
 (0)