Unify backend environment for Unit & Integration tests

test/emulator_backend.go

@@ -69,6 +69,7 @@ func newSystemClock() *systemClock {
 type deployedContractConstructorInvocation struct {
 	ConstructorArguments []interpreter.Value
 	ArgumentTypes        []sema.Type
+	Address              common.Address
 }
 
 var contractInvocations = make(
@@ -515,6 +516,7 @@ func (e *EmulatorBackend) DeployContract(
 	contractInvocations[name] = deployedContractConstructorInvocation{
 		ConstructorArguments: args,
 		ArgumentTypes:        argTypes,
+		Address:              account.Address,
 	}
 
 	return e.CommitBlock()
@@ -572,7 +574,6 @@ func (e *EmulatorBackend) replaceImports(code string) string {
 
 	sb := strings.Builder{}
 	importDeclEnd := 0
-
 	for _, importDeclaration := range program.ImportDeclarations() {
 		prevImportDeclEnd := importDeclEnd
 		importDeclEnd = importDeclaration.EndPos.Offset + 1

test/test_framework_provider.go

@@ -34,6 +34,8 @@ type TestFrameworkProvider struct {
 	stdlibHandler stdlib.StandardLibraryHandler
 
 	coverageReport *runtime.CoverageReport
+
+	emulatorBackend *EmulatorBackend
 }
 
 func (tf *TestFrameworkProvider) ReadFile(path string) (string, error) {
@@ -61,21 +63,29 @@ func (tf *TestFrameworkProvider) ReadFile(path string) (string, error) {
 }
 
 func (tf *TestFrameworkProvider) NewEmulatorBackend() stdlib.Blockchain {
-	return NewEmulatorBackend(
-		tf.fileResolver,
-		tf.stdlibHandler,
-		tf.coverageReport,
-	)
+	return tf.emulatorBackend
+	// return NewEmulatorBackend(
+	// 	tf.fileResolver,
+	// 	tf.stdlibHandler,
+	// 	tf.coverageReport,
+	// )
 }
 
 func NewTestFrameworkProvider(
 	fileResolver FileResolver,
 	stdlibHandler stdlib.StandardLibraryHandler,
 	coverageReport *runtime.CoverageReport,
 ) stdlib.TestFramework {
-	return &TestFrameworkProvider{
+	provider := &TestFrameworkProvider{
 		fileResolver:   fileResolver,
 		stdlibHandler:  stdlibHandler,
 		coverageReport: coverageReport,
 	}
+	provider.emulatorBackend = NewEmulatorBackend(
+		fileResolver,
+		stdlibHandler,
+		coverageReport,
+	)
+
+	return provider
 }