From aeee394c1f86785041fe5a607e54375ae604e382 Mon Sep 17 00:00:00 2001 From: Peter Argue <89119817+peterargue@users.noreply.github.com> Date: Thu, 18 Jul 2024 12:11:28 -0700 Subject: [PATCH] update to merged version of emulator --- integration/go.mod | 5 +---- integration/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/integration/go.mod b/integration/go.mod index 6e283ba3130..e44e89f7816 100644 --- a/integration/go.mod +++ b/integration/go.mod @@ -23,7 +23,7 @@ require ( github.com/onflow/crypto v0.25.1 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 - github.com/onflow/flow-emulator v1.0.0-preview.34 + github.com/onflow/flow-emulator v1.0.0-preview.35.0.20240718190812-a4af59d6987a github.com/onflow/flow-go v0.36.2-0.20240717214129-9ea6faeee3e7 github.com/onflow/flow-go-sdk v1.0.0-preview.41 github.com/onflow/flow-go/insecure v0.0.0-00010101000000-000000000000 @@ -358,6 +358,3 @@ require ( replace github.com/onflow/flow-go => ../ replace github.com/onflow/flow-go/insecure => ../insecure - -//TODO: remove when emulator is merged in -replace github.com/onflow/flow-emulator v1.0.0-preview.34 => github.com/The-K-R-O-K/flow-emulator v1.0.0-preview.12.0.20240718154908-30c1193b3f83 diff --git a/integration/go.sum b/integration/go.sum index bf40b9e7512..41c47576042 100644 --- a/integration/go.sum +++ b/integration/go.sum @@ -999,8 +999,6 @@ github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqR github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= -github.com/The-K-R-O-K/flow-emulator v1.0.0-preview.12.0.20240718154908-30c1193b3f83 h1:P8jW/1LFwzn9bVSytcSWxftKDB320WMS0eYMoy/3lbI= -github.com/The-K-R-O-K/flow-emulator v1.0.0-preview.12.0.20240718154908-30c1193b3f83/go.mod h1:+8V41dSi5qyU7beu+qbyLpK7p1olx9JoeJAbuqmly6E= github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= github.com/VictoriaMetrics/fastcache v1.12.1/go.mod h1:tX04vaqcNoQeGLD+ra5pU5sWkuxnzWhEzLwhP9w653o= github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI= @@ -2152,6 +2150,8 @@ github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 h1:q9tXLIALwQ76bO4 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1/go.mod h1:u/mkP/B+PbV33tEG3qfkhhBlydSvAKxfLZSfB4lsJHg= github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 h1:FfhMBAb78p6VAWkJ+iqdKLErGQVQgxk5w6DP5ZruWX8= github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1/go.mod h1:NgbMOYnMh0GN48VsNKZuiwK7uyk38Wyo8jN9+C9QE30= +github.com/onflow/flow-emulator v1.0.0-preview.35.0.20240718190812-a4af59d6987a h1:GzAosZmXAYM+qGs5y0DjdtjFfjO4h10sCmivKR3oeKA= +github.com/onflow/flow-emulator v1.0.0-preview.35.0.20240718190812-a4af59d6987a/go.mod h1:+8V41dSi5qyU7beu+qbyLpK7p1olx9JoeJAbuqmly6E= github.com/onflow/flow-ft/lib/go/contracts v1.0.0 h1:mToacZ5NWqtlWwk/7RgIl/jeKB/Sy/tIXdw90yKHcV0= github.com/onflow/flow-ft/lib/go/contracts v1.0.0/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A= github.com/onflow/flow-ft/lib/go/templates v1.0.0 h1:6cMS/lUJJ17HjKBfMO/eh0GGvnpElPgBXx7h5aoWJhs=