tests: refactor TestState to dedupe walk callback

Minor refactoring.
This commit is contained in:
meows 2019-11-20 07:54:18 -05:00
parent 3a4a3d080b
commit b8ced9e00b
No known key found for this signature in database
GPG Key ID: 5786AEA5C8D5A520

View File

@ -53,33 +53,25 @@ func TestState(t *testing.T) {
//st.fails(`^stRevertTest/RevertPrecompiledTouch(_storage)?\.json/ConstantinopleFix/0`, "bug in test") //st.fails(`^stRevertTest/RevertPrecompiledTouch(_storage)?\.json/ConstantinopleFix/0`, "bug in test")
//st.fails(`^stRevertTest/RevertPrecompiledTouch(_storage)?\.json/ConstantinopleFix/3`, "bug in test") //st.fails(`^stRevertTest/RevertPrecompiledTouch(_storage)?\.json/ConstantinopleFix/3`, "bug in test")
st.walk(t, stateTestDir, func(t *testing.T, name string, test *StateTest) {
for _, subtest := range test.Subtests() {
subtest := subtest
key := fmt.Sprintf("%s/%d", subtest.Fork, subtest.Index)
name := name + "/" + key
t.Run(key, func(t *testing.T) {
withTrace(t, test.gasLimit(subtest), func(vmconfig vm.Config) error {
_, err := test.Run(subtest, vmconfig)
return st.checkFailure(t, name, err)
})
})
}
})
// For Istanbul, older tests were moved into LegacyTests // For Istanbul, older tests were moved into LegacyTests
st.walk(t, legacyStateTestDir, func(t *testing.T, name string, test *StateTest) { for _, dir := range []string{
for _, subtest := range test.Subtests() { stateTestDir,
subtest := subtest legacyStateTestDir,
key := fmt.Sprintf("%s/%d", subtest.Fork, subtest.Index) } {
name := name + "/" + key st.walk(t, dir, func(t *testing.T, name string, test *StateTest) {
t.Run(key, func(t *testing.T) { for _, subtest := range test.Subtests() {
withTrace(t, test.gasLimit(subtest), func(vmconfig vm.Config) error { subtest := subtest
_, err := test.Run(subtest, vmconfig) key := fmt.Sprintf("%s/%d", subtest.Fork, subtest.Index)
return st.checkFailure(t, name, err) name := name + "/" + key
t.Run(key, func(t *testing.T) {
withTrace(t, test.gasLimit(subtest), func(vmconfig vm.Config) error {
_, err := test.Run(subtest, vmconfig)
return st.checkFailure(t, name, err)
})
}) })
}) }
} })
}) }
} }
// Transactions with gasLimit above this value will not get a VM trace on failure. // Transactions with gasLimit above this value will not get a VM trace on failure.