Merge pull request #2783 from m-Peter/refine-test-framework-api

Refine API of the testing framework
onflow · Sep 27, 2023 · 368d7e3 · 368d7e3
2 parents b9b9568 + 20a58ec
commit 368d7e3
Show file tree

Hide file tree

Showing 7 changed files with 577 additions and 524 deletions.
diff --git a/runtime/sema/type.go b/runtime/sema/type.go
@@ -4294,7 +4294,11 @@ func (t *CompositeType) GetMembers() map[string]MemberResolver {
 }
 
 func (t *CompositeType) initializeMemberResolvers() {
-	t.memberResolversOnce.Do(func() {
+	t.memberResolversOnce.Do(t.initializerMemberResolversFunc())
+}
+
+func (t *CompositeType) initializerMemberResolversFunc() func() {
+	return func() {
 		memberResolvers := MembersMapAsResolvers(t.Members)
 
 		// Check conformances.
@@ -4313,7 +4317,13 @@ func (t *CompositeType) initializeMemberResolvers() {
 			})
 
 		t.memberResolvers = withBuiltinMembers(t, memberResolvers)
-	})
+	}
+}
+
+func (t *CompositeType) ResolveMembers() {
+	if t.Members.Len() != len(t.GetMembers()) {
+		t.initializerMemberResolversFunc()()
+	}
 }
 
 func (t *CompositeType) FieldPosition(name string, declaration ast.CompositeLikeDeclaration) ast.Position {