From 1458dcf4252e27369884f1917340f3d1af02faed Mon Sep 17 00:00:00 2001
From: Ardit Marku <markoupetr@gmail.com>
Date: Thu, 28 Sep 2023 11:18:50 +0300
Subject: [PATCH] Remove workaround with compositeType.ResolveMembers()

---
 runtime/sema/type.go            | 14 ++------------
 runtime/stdlib/test_contract.go |  1 -
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/runtime/sema/type.go b/runtime/sema/type.go
index ec47eee467..4eb524bc5e 100644
--- a/runtime/sema/type.go
+++ b/runtime/sema/type.go
@@ -4294,11 +4294,7 @@ func (t *CompositeType) GetMembers() map[string]MemberResolver {
 }
 
 func (t *CompositeType) initializeMemberResolvers() {
-	t.memberResolversOnce.Do(t.initializerMemberResolversFunc())
-}
-
-func (t *CompositeType) initializerMemberResolversFunc() func() {
-	return func() {
+	t.memberResolversOnce.Do(func() {
 		memberResolvers := MembersMapAsResolvers(t.Members)
 
 		// Check conformances.
@@ -4317,13 +4313,7 @@ func (t *CompositeType) initializerMemberResolversFunc() func() {
 			})
 
 		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 {
diff --git a/runtime/stdlib/test_contract.go b/runtime/stdlib/test_contract.go
index 3a7bcd12fb..41610f5661 100644
--- a/runtime/stdlib/test_contract.go
+++ b/runtime/stdlib/test_contract.go
@@ -1193,7 +1193,6 @@ func newTestContractType() *TestContractType {
 	ty.expectFailureFunction = newTestTypeExpectFailureFunction(
 		expectFailureFunctionType,
 	)
-	compositeType.ResolveMembers()
 
 	return ty
 }