Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync Stable Cadence #2820

Merged
merged 19 commits into from
Sep 27, 2023
Merged

Sync Stable Cadence #2820

merged 19 commits into from
Sep 27, 2023

Conversation

turbolent
Copy link
Member

@turbolent turbolent commented Sep 27, 2023 •
edited
Loading

Description

Conflict resolution: 

git log -1 -p -w --remerge-diff HEAD
commit a1e43fbbb0165dcba5cec0580678af04b0cc7d19
Merge: fa75807f3 b9b956863
Author: Bastian Müller <[email protected]>
Date:   Wed Sep 27 11:14:59 2023 -0700

    Merge branch 'master' into bastian/sync-stable-cadence-8

diff --git a/go.cap b/go.cap
deleted file mode 100644
remerge CONFLICT (modify/delete): go.cap deleted in b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff) and modified in fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2).  Version fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2) of go.cap left in tree.
index be63e43a0..000000000
--- a/go.cap
+++ /dev/null
@@ -1,16 +0,0 @@
-github.com/onflow/cadence ()
-
-github.com/davecgh/go-spew/spew (file)
-github.com/k0kubun/pp (file, runtime)
-github.com/klauspost/cpuid/v2 (file, runtime)
-github.com/mattn/go-colorable (file)
-github.com/onflow/cadence/runtime/errors (runtime)
-github.com/onflow/cadence/runtime/parser (file)
-github.com/onflow/cadence/runtime/pretty (runtime)
-github.com/stretchr/testify/assert (runtime, file, network)
-github.com/stretchr/testify/require (network)
-github.com/texttheater/golang-levenshtein/levenshtein (file)
-github.com/zeebo/blake3/internal/consts (file)
-golang.org/x/sys/unix (runtime, syscall)
-golang.org/x/xerrors (runtime)
-github.com/onflow/cadence/runtime/interpreter (runtime)
diff --git a/go.mod b/go.mod
remerge CONFLICT (content): Merge conflict in go.mod
index a86df714c..a94a4e2f4 100644
--- a/go.mod
+++ b/go.mod
@@ -3,18 +3,6 @@ module github.com/onflow/cadence
 go 1.20
 
 require (
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
-	github.com/bits-and-blooms/bitset v1.2.2
-	github.com/c-bata/go-prompt v0.2.5
-	github.com/fxamacker/cbor/v2 v2.4.1-0.20230228173756-c0c9f774e40c
-	github.com/go-test/deep v1.0.5
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/leanovate/gopter v0.2.9
-	github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f
-	github.com/rivo/uniseg v0.2.1-0.20211004051800-57c86be7915a
-	github.com/schollz/progressbar/v3 v3.8.3
-	github.com/stretchr/testify v1.8.4
-=======
 	github.com/bits-and-blooms/bitset v1.5.0
 	github.com/bytecodealliance/wasmtime-go/v7 v7.0.0
 	github.com/c-bata/go-prompt v0.2.6
@@ -24,12 +12,11 @@ require (
 	github.com/kr/pretty v0.3.1
 	github.com/leanovate/gopter v0.2.9
 	github.com/logrusorgru/aurora/v4 v4.0.0
-	github.com/onflow/atree v0.6.0
+	github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f
 	github.com/rivo/uniseg v0.4.4
 	github.com/schollz/progressbar/v3 v3.13.1
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.8.4
 	github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 	github.com/tidwall/pretty v1.2.1
 	github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d
 	go.opentelemetry.io/otel v1.8.0
@@ -41,43 +28,32 @@ require (
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
 )
 
-require (
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
-	github.com/dave/dst v0.27.2
-	github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c
-)
-
 require (
 	github.com/SaveTheRbtz/mph v0.1.2
-	github.com/bytecodealliance/wasmtime-go/v7 v7.0.0
 	github.com/k0kubun/pp v3.0.1+incompatible
-	github.com/k0kubun/pp/v3 v3.2.0
-	github.com/logrusorgru/aurora/v4 v4.0.0
 	golang.org/x/exp v0.0.0-20230321023759-10a507213a29
 )
 
 require github.com/zeebo/xxh3 v1.0.2 // indirect
 
 require (
-=======
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fxamacker/circlehash v0.3.0 // indirect
 	github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
-	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/mattn/go-tty v0.0.3 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
-	github.com/pkg/term v1.1.0 // indirect
+	github.com/pkg/term v1.2.0-beta.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.9.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	github.com/zeebo/assert v1.3.0 // indirect
 	github.com/zeebo/blake3 v0.2.3 // indirect
 	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
-	golang.org/x/sys v0.2.0 // indirect
-	golang.org/x/term v0.1.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/term v0.6.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
remerge CONFLICT (content): Merge conflict in go.sum
index 41891f673..df32a1ac3 100644
--- a/go.sum
+++ b/go.sum
@@ -1,11 +1,12 @@
 github.com/SaveTheRbtz/mph v0.1.2 h1:5l3W496Up+7BNOVJQnJhzcGBh+wWfxWdmPUAkx3WmaM=
 github.com/SaveTheRbtz/mph v0.1.2/go.mod h1:V4+WtKQPe2+dEA5os1WnGsEB0NR9qgqqgIiSt73+sT4=
-github.com/bits-and-blooms/bitset v1.2.2 h1:J5gbX05GpMdBjCvQ9MteIg2KKDExr7DrgK+Yc15FvIk=
-github.com/bits-and-blooms/bitset v1.2.2/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
+github.com/bits-and-blooms/bitset v1.5.0 h1:NpE8frKRLGHIcEzkR+gZhiioW1+WbYV6fKwD6ZIpQT8=
+github.com/bits-and-blooms/bitset v1.5.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/bytecodealliance/wasmtime-go/v7 v7.0.0 h1:/rBNjgFju2HCZnkPb1eL+W4GBwP8DMbaQu7i+GR9DH4=
 github.com/bytecodealliance/wasmtime-go/v7 v7.0.0/go.mod h1:bu6fic7trDt20w+LMooX7j3fsOwv4/ln6j8gAdP6vmA=
-github.com/c-bata/go-prompt v0.2.5 h1:3zg6PecEywxNn0xiqcXHD96fkbxghD+gdB2tbsYfl+Y=
-github.com/c-bata/go-prompt v0.2.5/go.mod h1:vFnjEGDIIA/Lib7giyE4E9c50Lvl8j0S+7FVlAwDAVw=
+github.com/c-bata/go-prompt v0.2.6 h1:POP+nrHE+DfLYx370bedwNhsqmpCUynWPxuHi0C5vZI=
+github.com/c-bata/go-prompt v0.2.6/go.mod h1:/LMAke8wD2FsNu9EXNdHxNLbd9MedkPnCdfpU9wwHfY=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/dave/dst v0.27.2 h1:4Y5VFTkhGLC1oddtNwuxxe36pnyLxMFXT51FOzH8Ekc=
 github.com/dave/dst v0.27.2/go.mod h1:jHh6EOibnHgcUW3WjKHisiooEkYwqpHLBSX1iOBhEyc=
 github.com/dave/jennifer v1.5.0 h1:HmgPN93bVDpkQyYbqhCHj5QlgvUkvEOzMyEvKLgCRrg=
@@ -16,13 +17,7 @@ github.com/fxamacker/cbor/v2 v2.4.1-0.20230228173756-c0c9f774e40c h1:5tm/Wbs9d9r
 github.com/fxamacker/cbor/v2 v2.4.1-0.20230228173756-c0c9f774e40c/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
 github.com/fxamacker/circlehash v0.3.0 h1:XKdvTtIJV9t7DDUtsf0RIpC1OcxZtPbmgIH7ekx28WA=
 github.com/fxamacker/circlehash v0.3.0/go.mod h1:3aq3OfVvsWtkWMb6A1owjOQFA+TLsD5FgJflnaQwtMM=
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
-github.com/go-test/deep v1.0.5 h1:AKODKU3pDH1RzZzm6YZu77YWtEAq6uh1rLIAQlay2qc=
-github.com/go-test/deep v1.0.5/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
-=======
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
 github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw=
@@ -31,21 +26,15 @@ github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3t
 github.com/k0kubun/pp/v3 v3.2.0 h1:h33hNTZ9nVFNP3u2Fsgz8JXiF5JINoZfFq4SvKJwNcs=
 github.com/k0kubun/pp/v3 v3.2.0/go.mod h1:ODtJQbQcIRfAD3N+theGCV1m/CBxweERz2dapdz1EwA=
 github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
 github.com/klauspost/cpuid/v2 v2.2.0 h1:4ZexSFt8agMNzNisrsilL6RClWDC5YJnLHNIfTy4iuc=
 github.com/klauspost/cpuid/v2 v2.2.0/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-=======
-github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
-github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
 github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
 github.com/logrusorgru/aurora/v4 v4.0.0 h1:sRjfPpun/63iADiSvGGjgA1cAYegEWMPCJdUpJYn9JA=
@@ -57,33 +46,20 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
-github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
+github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-tty v0.0.3 h1:5OfyWorkyO7xP52Mq7tB36ajHDG5OHrmBGIS/DtakQI=
 github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvrWyR0=
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
 github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f h1:Z8/PgTqOgOg02MTRpTBYO2k16FE6z4wEOtaC2WBR9Xo=
 github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f/go.mod h1:xvP61FoOs95K7IYdIYRnNcYQGf4nbF/uuJ0tHf4DRuM=
-github.com/pkg/term v1.1.0 h1:xIAAdCMh3QIAy+5FrE8Ad8XoDhEU4ufwbaSozViP9kk=
-github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.2.1-0.20211004051800-57c86be7915a h1:s7GrsqeorVkFR1vGmQ6WVL9nup0eyQCC+YVUeSQLH/Q=
-github.com/rivo/uniseg v0.2.1-0.20211004051800-57c86be7915a/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/schollz/progressbar/v3 v3.8.3 h1:FnLGl3ewlDUP+YdSwveXBaXs053Mem/du+wr7XSYKl8=
-github.com/schollz/progressbar/v3 v3.8.3/go.mod h1:pWnVCjSBZsT2X3nx9HfRdnCDrpbevliMeoEVhStwHko=
-=======
-github.com/onflow/atree v0.6.0 h1:j7nQ2r8npznx4NX39zPpBYHmdy45f4xwoi+dm37Jk7c=
-github.com/onflow/atree v0.6.0/go.mod h1:gBHU0M05qCbv9NN0kijLWMgC47gHVNBIp4KmsVFi0tc=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/term v1.2.0-beta.2 h1:L3y/h2jkuBVFdWiJvNfYfKmzcCnILw7mJWm2JQuMppw=
 github.com/pkg/term v1.2.0-beta.2/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw=
@@ -96,7 +72,6 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/schollz/progressbar/v3 v3.13.1 h1:o8rySDYiQ59Mwzy2FELeHY5ZARXZTVJC7iHD6PEFUiE=
 github.com/schollz/progressbar/v3 v3.13.1/go.mod h1:xvrbki8kfT1fzWzBT/UZd9L6GA+jdL7HAgq2RFnO6fQ=
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
@@ -114,10 +89,6 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
 github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
-=======
-github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 github.com/zeebo/blake3 v0.2.3 h1:TFoLXsjeXqRNFxSbk35Dk4YtszE/MQQGK10BH4ptoTg=
 github.com/zeebo/blake3 v0.2.3/go.mod h1:mjJjZpnsyIVtVgTOSpJ9vmRE4wgDeyt2HU3qXvvKCaQ=
 github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
@@ -130,7 +101,6 @@ go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
 golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
@@ -144,7 +114,6 @@ golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -156,23 +125,15 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200918174421-af09f7315aff/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
-golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
diff --git a/runtime/capabilitycontrollers_test.go b/runtime/capabilitycontrollers_test.go
remerge CONFLICT (content): Merge conflict in runtime/capabilitycontrollers_test.go
index 38a8e81a8..743859a25 100644
--- a/runtime/capabilitycontrollers_test.go
+++ b/runtime/capabilitycontrollers_test.go
@@ -2602,7 +2602,6 @@ func TestRuntimeCapabilityControllers(t *testing.T) {
 
 }
 
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
 func TestRuntimeCapabilityBorrowAsInheritedInterface(t *testing.T) {
 
 	t.Parallel()
@@ -2695,7 +2694,8 @@ func TestRuntimeCapabilityBorrowAsInheritedInterface(t *testing.T) {
 	)
 
 	require.NoError(t, err)
-=======
+}
+
 func TestRuntimeCapabilityControllerOperationAfterDeletion(t *testing.T) {
 
 	t.Parallel()
@@ -2718,13 +2718,12 @@ func TestRuntimeCapabilityControllerOperationAfterDeletion(t *testing.T) {
 		t.Run(testName, func(t *testing.T) {
 			t.Parallel()
 
-			rt := newTestInterpreterRuntime()
-			rt.defaultConfig.CapabilityControllersEnabled = true
+			rt := NewTestInterpreterRuntime()
 
 			tx := []byte(fmt.Sprintf(
 				`
                   transaction {
-                      prepare(signer: AuthAccount) {
+                      prepare(signer: auth(Capabilities) &Account) {
                           %s
                           %s
                       }
@@ -2737,22 +2736,22 @@ func TestRuntimeCapabilityControllerOperationAfterDeletion(t *testing.T) {
 			address := common.MustBytesToAddress([]byte{0x1})
 			accountIDs := map[common.Address]uint64{}
 
-			runtimeInterface := &testRuntimeInterface{
-				storage: newTestLedger(nil, nil),
-				getSigningAccounts: func() ([]Address, error) {
+			runtimeInterface := &TestRuntimeInterface{
+				Storage: NewTestLedger(nil, nil),
+				OnGetSigningAccounts: func() ([]Address, error) {
 					return []Address{address}, nil
 				},
-				emitEvent: func(event cadence.Event) error {
+				OnEmitEvent: func(event cadence.Event) error {
 					return nil
 				},
-				generateAccountID: func(address common.Address) (uint64, error) {
+				OnGenerateAccountID: func(address common.Address) (uint64, error) {
 					accountID := accountIDs[address] + 1
 					accountIDs[address] = accountID
 					return accountID, nil
 				},
 			}
 
-			nextTransactionLocation := newTransactionLocationGenerator()
+			nextTransactionLocation := NewTransactionLocationGenerator()
 
 			// Test
 
@@ -2782,6 +2781,7 @@ func TestRuntimeCapabilityControllerOperationAfterDeletion(t *testing.T) {
               // Prepare bound functions
               let delete = controller.delete
               let tag = controller.tag
+              let setTag = controller.setTag
               let target = controller.target
               let retarget = controller.retarget
 
@@ -2813,7 +2813,7 @@ func TestRuntimeCapabilityControllerOperationAfterDeletion(t *testing.T) {
 				},
 				{
 					name: "set tag",
-					code: `controller.tag = "test"`,
+					code: `setTag("test")`,
 				},
 				{
 					name: "target",
@@ -2830,12 +2830,13 @@ func TestRuntimeCapabilityControllerOperationAfterDeletion(t *testing.T) {
 			setup: `
               // Issue capability and get controller
               let accountCapabilities = signer.capabilities.account
-              let capability = accountCapabilities.issue<&AuthAccount>()
+              let capability = accountCapabilities.issue<auth(Storage) &Account>()
               let controller = accountCapabilities.getController(byCapabilityID: capability.id)!
 
               // Prepare bound functions
               let delete = controller.delete
               let tag = controller.tag
+              let setTag = controller.setTag
 
               // Delete
               controller.delete()
@@ -2865,7 +2866,7 @@ func TestRuntimeCapabilityControllerOperationAfterDeletion(t *testing.T) {
 				},
 				{
 					name: "set tag",
-					code: `controller.tag = "test"`,
+					code: `setTag("test")`,
 				},
 			},
 		},
@@ -2876,5 +2877,4 @@ func TestRuntimeCapabilityControllerOperationAfterDeletion(t *testing.T) {
 			test(testCase, operation)
 		}
 	}
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 }
diff --git a/runtime/environment.go b/runtime/environment.go
remerge CONFLICT (content): Merge conflict in runtime/environment.go
index 7161c74f3..605d7f544 100644
--- a/runtime/environment.go
+++ b/runtime/environment.go
@@ -202,21 +202,10 @@ func (e *interpreterEnvironment) DeclareValue(valueDeclaration stdlib.StandardLi
 	interpreter.Declare(e.baseActivation, valueDeclaration)
 }
 
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
-=======
 func (e *interpreterEnvironment) DeclareType(typeDeclaration stdlib.StandardLibraryType) {
 	e.baseTypeActivation.DeclareType(typeDeclaration)
 }
 
-func (e *interpreterEnvironment) NewAuthAccountValue(address interpreter.AddressValue) interpreter.Value {
-	return stdlib.NewAuthAccountValue(e, e, address)
-}
-
-func (e *interpreterEnvironment) NewPublicAccountValue(address interpreter.AddressValue) interpreter.Value {
-	return stdlib.NewPublicAccountValue(e, e, address)
-}
-
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 func (e *interpreterEnvironment) MeterMemory(usage common.MemoryUsage) error {
 	return e.runtimeInterface.MeterMemory(usage)
 }
diff --git a/runtime/interpreter/value_accountcapabilitycontroller.go b/runtime/interpreter/value_accountcapabilitycontroller.go
remerge CONFLICT (content): Merge conflict in runtime/interpreter/value_accountcapabilitycontroller.go
index 198af4713..e28157329 100644
--- a/runtime/interpreter/value_accountcapabilitycontroller.go
+++ b/runtime/interpreter/value_accountcapabilitycontroller.go
@@ -39,23 +39,16 @@ type AccountCapabilityControllerValue struct {
 	// Lazily initialized function values.
 	// Host functions based on injected functions (see below).
 	deleteFunction FunctionValue
+	setTagFunction FunctionValue
 
 	// Injected functions.
 	// Tags are not stored directly inside the controller
 	// to avoid unnecessary storage reads
 	// when the controller is loaded for borrowing/checking
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
-	GetCapability  func() *CapabilityValue
-	GetTag         func() *StringValue
-	SetTag         func(*StringValue)
-	DeleteFunction FunctionValue
-	setTagFunction FunctionValue
-=======
-	GetCapability func(inter *Interpreter) *IDCapabilityValue
+	GetCapability func(inter *Interpreter) *CapabilityValue
 	GetTag        func(inter *Interpreter) *StringValue
 	SetTag        func(inter *Interpreter, tag *StringValue)
 	Delete        func(inter *Interpreter, locationRange LocationRange)
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 }
 
 func NewUnmeteredAccountCapabilityControllerValue(
@@ -237,22 +230,13 @@ func (v *AccountCapabilityControllerValue) GetMember(inter *Interpreter, _ Locat
 
 	switch name {
 	case sema.AccountCapabilityControllerTypeTagFieldName:
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
-		if v.tag == nil {
-			v.tag = v.GetTag()
-			if v.tag == nil {
-				v.tag = EmptyString
-			}
-		}
-		return v.tag
+		return v.GetTag(inter)
+
 	case sema.AccountCapabilityControllerTypeSetTagFunctionName:
 		if v.setTagFunction == nil {
 			v.setTagFunction = v.newSetTagFunction(inter)
 		}
 		return v.setTagFunction
-=======
-		return v.GetTag(inter)
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 
 	case sema.AccountCapabilityControllerTypeCapabilityIDFieldName:
 		return v.CapabilityID
@@ -383,18 +367,19 @@ func (v *AccountCapabilityControllerValue) newDeleteFunction(
 
 func (v *AccountCapabilityControllerValue) newSetTagFunction(
 	inter *Interpreter,
-) *HostFunctionValue {
-	return NewHostFunctionValue(
+) FunctionValue {
+	return v.newHostFunctionValue(
 		inter,
 		sema.AccountCapabilityControllerTypeSetTagFunctionType,
 		func(invocation Invocation) Value {
+			inter := invocation.Interpreter
+
 			newTagValue, ok := invocation.Arguments[0].(*StringValue)
 			if !ok {
 				panic(errors.NewUnreachableError())
 			}
 
-			v.tag = newTagValue
-			v.SetTag(newTagValue)
+			v.SetTag(inter, newTagValue)
 
 			return Void
 		},
diff --git a/runtime/interpreter/value_storagecapabilitycontroller.go b/runtime/interpreter/value_storagecapabilitycontroller.go
remerge CONFLICT (content): Merge conflict in runtime/interpreter/value_storagecapabilitycontroller.go
index b8aa8b959..fa80326bf 100644
--- a/runtime/interpreter/value_storagecapabilitycontroller.go
+++ b/runtime/interpreter/value_storagecapabilitycontroller.go
@@ -54,26 +54,17 @@ type StorageCapabilityControllerValue struct {
 	deleteFunction   FunctionValue
 	targetFunction   FunctionValue
 	retargetFunction FunctionValue
+	setTagFunction   FunctionValue
 
 	// Injected functions.
 	// Tags are not stored directly inside the controller
 	// to avoid unnecessary storage reads
 	// when the controller is loaded for borrowing/checking
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
-	GetCapability    func() *CapabilityValue
-	GetTag           func() *StringValue
-	SetTag           func(*StringValue)
-	TargetFunction   FunctionValue
-	RetargetFunction FunctionValue
-	DeleteFunction   FunctionValue
-	setTagFunction   FunctionValue
-=======
-	GetCapability func(inter *Interpreter) *IDCapabilityValue
+	GetCapability func(inter *Interpreter) *CapabilityValue
 	GetTag        func(inter *Interpreter) *StringValue
 	SetTag        func(inter *Interpreter, tag *StringValue)
 	Delete        func(inter *Interpreter, locationRange LocationRange)
 	SetTarget     func(inter *Interpreter, locationRange LocationRange, target PathValue)
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 }
 
 func NewUnmeteredStorageCapabilityControllerValue(
@@ -437,18 +428,19 @@ func (v *StorageCapabilityControllerValue) newRetargetFunction(
 
 func (v *StorageCapabilityControllerValue) newSetTagFunction(
 	inter *Interpreter,
-) *HostFunctionValue {
-	return NewHostFunctionValue(
+) FunctionValue {
+	return v.newHostFunctionValue(
 		inter,
 		sema.StorageCapabilityControllerTypeSetTagFunctionType,
 		func(invocation Invocation) Value {
+			inter := invocation.Interpreter
+
 			newTagValue, ok := invocation.Arguments[0].(*StringValue)
 			if !ok {
 				panic(errors.NewUnreachableError())
 			}
 
-			v.tag = newTagValue
-			v.SetTag(newTagValue)
+			v.SetTag(inter, newTagValue)
 
 			return Void
 		},
diff --git a/runtime/predeclaredvalues_test.go b/runtime/predeclaredvalues_test.go
remerge CONFLICT (content): Merge conflict in runtime/predeclaredvalues_test.go
index 6d777d796..0c7577478 100644
--- a/runtime/predeclaredvalues_test.go
+++ b/runtime/predeclaredvalues_test.go
@@ -30,12 +30,8 @@ import (
 	"github.com/onflow/cadence/runtime/interpreter"
 	"github.com/onflow/cadence/runtime/sema"
 	"github.com/onflow/cadence/runtime/stdlib"
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
 	. "github.com/onflow/cadence/runtime/tests/runtime_utils"
-	"github.com/onflow/cadence/runtime/tests/utils"
-=======
 	. "github.com/onflow/cadence/runtime/tests/utils"
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 )
 
 func TestRuntimePredeclaredValues(t *testing.T) {
@@ -157,19 +153,20 @@ func TestRuntimePredeclaredTypes(t *testing.T) {
 		}
 
 		script := []byte(`
-          pub fun main(): X {
+          access(all)
+          fun main(): X {
               return x
           }
 	    `)
 
-		runtime := newTestInterpreterRuntime()
+		runtime := NewTestInterpreterRuntime()
 
-		runtimeInterface := &testRuntimeInterface{
-			storage: newTestLedger(nil, nil),
-			getSigningAccounts: func() ([]Address, error) {
+		runtimeInterface := &TestRuntimeInterface{
+			Storage: NewTestLedger(nil, nil),
+			OnGetSigningAccounts: func() ([]Address, error) {
 				return []Address{common.MustBytesToAddress([]byte{0x1})}, nil
 			},
-			resolveLocation: singleIdentifierLocationResolver(t),
+			OnResolveLocation: NewSingleIdentifierLocationResolver(t),
 		}
 
 		// Run script
@@ -227,19 +224,20 @@ func TestRuntimePredeclaredTypes(t *testing.T) {
 		}
 
 		script := []byte(`
-          pub fun main(): X {
+          access(all)
+          fun main(): X {
               return x
           }
 	    `)
 
-		runtime := newTestInterpreterRuntime()
+		runtime := NewTestInterpreterRuntime()
 
-		runtimeInterface := &testRuntimeInterface{
-			storage: newTestLedger(nil, nil),
-			getSigningAccounts: func() ([]Address, error) {
+		runtimeInterface := &TestRuntimeInterface{
+			Storage: NewTestLedger(nil, nil),
+			OnGetSigningAccounts: func() ([]Address, error) {
 				return []Address{common.MustBytesToAddress([]byte{0x1})}, nil
 			},
-			resolveLocation: singleIdentifierLocationResolver(t),
+			OnResolveLocation: NewSingleIdentifierLocationResolver(t),
 		}
 
 		// Run script
@@ -261,12 +259,10 @@ func TestRuntimePredeclaredTypes(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Equal(t,
-			cadence.ValueWithCachedTypeID(
 			cadence.Struct{
 				StructType: cadence.NewStructType(nil, xType.QualifiedIdentifier(), []cadence.Field{}, nil),
 				Fields:     []cadence.Value{},
 			},
-			),
 			result,
 		)
 	})
@@ -296,19 +292,20 @@ func TestRuntimePredeclaredTypes(t *testing.T) {
 		}
 
 		script := []byte(`
-          pub fun main(): AnyStruct {
+          access(all)
+          fun main(): AnyStruct {
               return x
           }
 	    `)
 
-		runtime := newTestInterpreterRuntime()
+		runtime := NewTestInterpreterRuntime()
 
-		runtimeInterface := &testRuntimeInterface{
-			storage: newTestLedger(nil, nil),
-			getSigningAccounts: func() ([]Address, error) {
+		runtimeInterface := &TestRuntimeInterface{
+			Storage: NewTestLedger(nil, nil),
+			OnGetSigningAccounts: func() ([]Address, error) {
 				return []Address{common.MustBytesToAddress([]byte{0x1})}, nil
 			},
-			resolveLocation: singleIdentifierLocationResolver(t),
+			OnResolveLocation: NewSingleIdentifierLocationResolver(t),
 		}
 
 		// Run script
@@ -371,19 +368,20 @@ func TestRuntimePredeclaredTypes(t *testing.T) {
 		}
 
 		script := []byte(`
-          pub fun main(): X.Y {
+          access(all)
+          fun main(): X.Y {
               return y
           }
 	    `)
 
-		runtime := newTestInterpreterRuntime()
+		runtime := NewTestInterpreterRuntime()
 
-		runtimeInterface := &testRuntimeInterface{
-			storage: newTestLedger(nil, nil),
-			getSigningAccounts: func() ([]Address, error) {
+		runtimeInterface := &TestRuntimeInterface{
+			Storage: NewTestLedger(nil, nil),
+			OnGetSigningAccounts: func() ([]Address, error) {
 				return []Address{common.MustBytesToAddress([]byte{0x1})}, nil
 			},
-			resolveLocation: singleIdentifierLocationResolver(t),
+			OnResolveLocation: NewSingleIdentifierLocationResolver(t),
 		}
 
 		// Run script
@@ -405,12 +403,10 @@ func TestRuntimePredeclaredTypes(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Equal(t,
-			cadence.ValueWithCachedTypeID(
 			cadence.Struct{
 				StructType: cadence.NewStructType(nil, yType.QualifiedIdentifier(), []cadence.Field{}, nil),
 				Fields:     []cadence.Value{},
 			},
-			),
 			result,
 		)
 	})
@@ -448,19 +444,20 @@ func TestRuntimePredeclaredTypes(t *testing.T) {
 		}
 
 		script := []byte(`
-          pub fun main(): AnyStruct {
+          access(all)
+          fun main(): AnyStruct {
               return y
           }
 	    `)
 
-		runtime := newTestInterpreterRuntime()
+		runtime := NewTestInterpreterRuntime()
 
-		runtimeInterface := &testRuntimeInterface{
-			storage: newTestLedger(nil, nil),
-			getSigningAccounts: func() ([]Address, error) {
+		runtimeInterface := &TestRuntimeInterface{
+			Storage: NewTestLedger(nil, nil),
+			OnGetSigningAccounts: func() ([]Address, error) {
 				return []Address{common.MustBytesToAddress([]byte{0x1})}, nil
 			},
-			resolveLocation: singleIdentifierLocationResolver(t),
+			OnResolveLocation: NewSingleIdentifierLocationResolver(t),
 		}
 
 		// Run script
diff --git a/runtime/stdlib/account.go b/runtime/stdlib/account.go
remerge CONFLICT (content): Merge conflict in runtime/stdlib/account.go
index c9d00fab5..17ae64b93 100644
--- a/runtime/stdlib/account.go
+++ b/runtime/stdlib/account.go
@@ -3759,23 +3759,14 @@ func getCapabilityControllerTag(
 func newCapabilityControllerGetCapabilityFunction(
 	address common.Address,
 	controller interpreter.CapabilityControllerValue,
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
-) func() *interpreter.CapabilityValue {
-=======
-) func(inter *interpreter.Interpreter) *interpreter.IDCapabilityValue {
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
+) func(inter *interpreter.Interpreter) *interpreter.CapabilityValue {
 
 	addressValue := interpreter.AddressValue(address)
 	capabilityID := controller.ControllerCapabilityID()
 	borrowType := controller.CapabilityControllerBorrowType()
 
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
-	return func() *interpreter.CapabilityValue {
+	return func(inter *interpreter.Interpreter)  *interpreter.CapabilityValue {
 		return interpreter.NewCapabilityValue(
-=======
-	return func(inter *interpreter.Interpreter) *interpreter.IDCapabilityValue {
-		return interpreter.NewIDCapabilityValue(
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 			inter,
 			capabilityID,
 			addressValue,
diff --git a/runtime/tests/checker/attachments_test.go b/runtime/tests/checker/attachments_test.go
remerge CONFLICT (content): Merge conflict in runtime/tests/checker/attachments_test.go
index b65da6806..4e22cca97 100644
--- a/runtime/tests/checker/attachments_test.go
+++ b/runtime/tests/checker/attachments_test.go
@@ -4212,7 +4212,6 @@ func TestCheckAttachmentsNotEnabled(t *testing.T) {
 	})
 }
 
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
 func TestCheckAttachmentForEachAttachment(t *testing.T) {
 
 	t.Parallel()
@@ -4536,7 +4535,9 @@ func TestCheckAttachmentForEachAttachment(t *testing.T) {
 		)
 
 		require.NoError(t, err)
-=======
+	})
+}
+
 func TestCheckAttachmentRemoveLossTracking(t *testing.T) {
 
 	t.Run("remove immediately added attachment", func(t *testing.T) {
@@ -4575,6 +4576,5 @@ func TestCheckAttachmentRemoveLossTracking(t *testing.T) {
 
 		errs := RequireCheckerErrors(t, err, 1)
 		assert.IsType(t, &sema.ResourceLossError{}, errs[0])
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 	})
 }
diff --git a/runtime/tests/interpreter/interpreter_test.go b/runtime/tests/interpreter/interpreter_test.go
remerge CONFLICT (content): Merge conflict in runtime/tests/interpreter/interpreter_test.go
index 72f57ee69..2f5d274df 100644
--- a/runtime/tests/interpreter/interpreter_test.go
+++ b/runtime/tests/interpreter/interpreter_test.go
@@ -24,12 +24,9 @@ import (
 	"strings"
 	"testing"
 
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
 	"github.com/onflow/atree"
 
-=======
 	"github.com/onflow/cadence/runtime"
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 	"github.com/onflow/cadence/runtime/activations"
 
 	"github.com/stretchr/testify/assert"
@@ -8510,10 +8507,11 @@ func TestInterpretContractAccountFieldUse(t *testing.T) {
       access(all) let address2 = Test.test()
     `
 
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
+	t.Run("with custom handler", func(t *testing.T) {
 		addressValue := interpreter.AddressValue(common.MustBytesToAddress([]byte{0x1}))
 
-	inter, err := parseCheckAndInterpretWithOptions(t, code,
+		inter, err := parseCheckAndInterpretWithOptions(t,
+			code,
 			ParseCheckAndInterpretOptions{
 				Config: &interpreter.Config{
 					ContractValueHandler: makeContractValueHandler(nil, nil, nil),
@@ -8534,27 +8532,7 @@ func TestInterpretContractAccountFieldUse(t *testing.T) {
 						return map[string]interpreter.Value{
 							sema.ContractAccountFieldName: accountRef,
 						}
-=======
-	t.Run("with custom handler", func(t *testing.T) {
-		addressValue := interpreter.AddressValue{
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
-		}
-
-		inter, err := parseCheckAndInterpretWithOptions(t, code,
-			ParseCheckAndInterpretOptions{
-				Config: &interpreter.Config{
-					ContractValueHandler: makeContractValueHandler(nil, nil, nil),
-					InjectedCompositeFieldsHandler: func(
-						inter *interpreter.Interpreter,
-						_ common.Location,
-						_ string,
-						_ common.CompositeKind,
-					) map[string]interpreter.Value {
-						return map[string]interpreter.Value{
-							"account": newTestAuthAccountValue(inter, addressValue),
-						}
 					},
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 				},
 			},
 		)
diff --git a/runtime/tests/utils/utils.go b/runtime/tests/utils/utils.go
remerge CONFLICT (content): Merge conflict in runtime/tests/utils/utils.go
index ac308eee1..eb581635a 100644
--- a/runtime/tests/utils/utils.go
+++ b/runtime/tests/utils/utils.go
@@ -24,13 +24,8 @@ import (
 	"strings"
 	"testing"
 
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
-	"github.com/go-test/deep"
 	"github.com/k0kubun/pp"
-=======
-	"github.com/k0kubun/pp/v3"
 	"github.com/kr/pretty"
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -70,20 +65,8 @@ func AssertEqualWithDiff(t *testing.T, expected, actual any) {
 				s.WriteString("          ")
 			}
 
-<<<<<<< fa75807f3 (Merge pull request #2791 from darkdrag00nv2/string_split2)
-			t.Errorf(
-				"Not equal: \n"+
-					"expected: %s\n"+
-					"actual  : %s\n\n"+
-					"%s",
-				pp.Sprint(expected),
-				pp.Sprint(actual),
-				s.String(),
-			)
-=======
 			s.WriteString(d)
 			s.WriteString("\n")
->>>>>>> b9b956863 (Merge pull request #2819 from onflow/bastian/fix-test-diff)
 		}
 
 		t.Errorf(

  • Targeted PR against master branch
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work
  • Code follows the standards mentioned here
  • Updated relevant documentation
  • Re-reviewed Files changed in the Github PR explorer
  • Added appropriate labels

turbolent and others added 18 commits September 14, 2023 15:57
@turbolent
fix capability controller deletion
cdb8110
@turbolent
assign to whole group
bc918dd
@turbolent
assign whole group
6486dd5
@turbolent
Update .github/ISSUE_TEMPLATE/feature-request.yaml
7cdde06
@turbolent
Merge pull request #2797 from onflow/bastian/issue-template-assign-ca…
96e15fd 
…dence-group
@dsainati1
properly check removed expression for resource loss
0639275
@dsainati1
Merge pull request #2798 from onflow/sainati/attachment-resource-loss
1b64714 
Properly check removed expression for resource loss
@turbolent
check functions from GetMember of capability controller values checke…
4957cb1 
…d for deletion
@m-Peter
Replace panic with nil return in newInjectedCompositeFieldsHandler
58bf115
@turbolent
add support for injecting types into the environment
7cb1074
@turbolent
Merge pull request #2788 from onflow/bastian/fix-capability-controlle…
d4cd626 
…r-deletion
@turbolent
add support for injecting composite types, potentially nested: perfor…
957de13 
…m lookup in base type activation
@SupunS
Merge pull request #2808 from m-Peter/injected-fields-handler-remove-…
1309c1d 
…panic

Replace panic with nil return in `newInjectedCompositeFieldsHandler`
@turbolent
use kr/pretty instead of go-test/deep to prevent empty diffs
9e8068e
@turbolent
Merge pull request #2811 from onflow/bastian/allow-type-injection
10f50bc
@turbolent
remove gocap
74e0b2d
@turbolent
Merge pull request #2819 from onflow/bastian/fix-test-diff
b9b9568 
Use kr/pretty instead of go-test/deep to prevent empty diffs, remove gocap
@turbolent
Merge branch 'master' into bastian/sync-stable-cadence-8
a1e43fb
@turbolent turbolent self-assigned this Sep 27, 2023
@turbolent turbolent mentioned this pull request Sep 27, 2023
Merged
6 tasks
@github-actions
Copy link

github-actions bot commented Sep 27, 2023 •
edited
Loading

Cadence Benchstat comparison

This branch with compared with the base branch onflow:feature/stable-cadence commit fa75807
The command for i in {1..N}; do go test ./... -run=XXX -bench=. -benchmem -shuffle=on; done was used.
Bench tests were run a total of 7 times on each branch.

Collapsed results for better readability

old.txtnew.txt
time/opdelta
DecodeBatchEventsCCF-2172ms ± 0%176ms ± 0%~(p=1.000 n=1+1)
DecodeBatchEventsJSON-2507ms ± 0%510ms ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowFees.FeesDeducted-23.81µs ± 0%3.89µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowFees.TokensWithdrawn-22.85µs ± 0%2.79µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowIDTableStaking.DelegatorRewardsPaid-23.80µs ± 0%3.79µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowIDTableStaking.EpochTotalRewardsPaid-24.29µs ± 0%4.29µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowIDTableStaking.NewWeeklyPayout-22.87µs ± 0%2.91µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowIDTableStaking.RewardsPaid-23.44µs ± 0%3.42µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowToken.TokensDeposited-23.43µs ± 0%3.47µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowToken.TokensDeposited_with_nil_receiver-23.33µs ± 0%3.40µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowToken.TokensMinted-22.86µs ± 0%2.85µs ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowToken.TokensWithdrawn-23.51µs ± 0%3.50µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowFees.FeesDeducted-212.7µs ± 0%12.8µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowFees.TokensWithdrawn-27.47µs ± 0%7.45µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowIDTableStaking.DelegatorRewardsPaid-211.4µs ± 0%11.6µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowIDTableStaking.EpochTotalRewardsPaid-215.7µs ± 0%15.8µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowIDTableStaking.NewWeeklyPayout-27.61µs ± 0%7.60µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowIDTableStaking.RewardsPaid-29.63µs ± 0%9.67µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowToken.TokensDeposited-210.1µs ± 0%10.2µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowToken.TokensDeposited_with_nil_receiver-29.14µs ± 0%9.12µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowToken.TokensMinted-27.48µs ± 0%7.49µs ± 0%~(p=1.000 n=1+1)
DecodeJSON/FlowToken.TokensWithdrawn-210.1µs ± 0%10.1µs ± 0%~(p=1.000 n=1+1)
EncodeBatchEventsCCF-2119ms ± 0%115ms ± 0%~(p=1.000 n=1+1)
EncodeBatchEventsJSON-2146ms ± 0%144ms ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowFees.FeesDeducted-23.87µs ± 0%3.78µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowFees.TokensWithdrawn-23.33µs ± 0%3.07µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowIDTableStaking.DelegatorRewardsPaid-24.16µs ± 0%4.27µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowIDTableStaking.EpochTotalRewardsPaid-24.52µs ± 0%4.26µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowIDTableStaking.NewWeeklyPayout-23.33µs ± 0%3.49µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowIDTableStaking.RewardsPaid-22.29µs ± 0%3.37µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowToken.TokensDeposited-22.68µs ± 0%2.34µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowToken.TokensDeposited_with_nil_receiver-22.36µs ± 0%2.31µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowToken.TokensMinted-22.06µs ± 0%2.04µs ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowToken.TokensWithdrawn-22.37µs ± 0%2.41µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowFees.FeesDeducted-23.52µs ± 0%3.51µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowFees.TokensWithdrawn-22.14µs ± 0%2.03µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowIDTableStaking.DelegatorRewardsPaid-23.06µs ± 0%3.00µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowIDTableStaking.EpochTotalRewardsPaid-24.38µs ± 0%4.27µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowIDTableStaking.NewWeeklyPayout-22.09µs ± 0%2.07µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowIDTableStaking.RewardsPaid-22.61µs ± 0%2.60µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowToken.TokensDeposited-23.04µs ± 0%3.07µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowToken.TokensDeposited_with_nil_receiver-22.39µs ± 0%2.39µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowToken.TokensMinted-22.08µs ± 0%2.05µs ± 0%~(p=1.000 n=1+1)
EncodeJSON/FlowToken.TokensWithdrawn-22.99µs ± 0%2.98µs ± 0%~(p=1.000 n=1+1)
ExportType/composite_type-2411ns ± 0%419ns ± 0%~(p=1.000 n=1+1)
ExportType/simple_type-296.1ns ± 0%85.2ns ± 0%~(p=1.000 n=1+1)
InterpretRecursionFib-22.70ms ± 0%2.66ms ± 0%~(p=1.000 n=1+1)
NewInterpreter/new_interpreter-21.28µs ± 0%1.25µs ± 0%~(p=1.000 n=1+1)
NewInterpreter/new_sub-interpreter-2651ns ± 0%634ns ± 0%~(p=1.000 n=1+1)
ParseArray-27.85ms ± 0%7.83ms ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-212.1ms ± 0%12.0ms ± 0%~(p=1.000 n=1+1)
ParseDeploy/decode_hex-21.25ms ± 0%1.26ms ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/With_memory_metering-2201µs ± 0%196µs ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/Without_memory_metering-2156µs ± 0%157µs ± 0%~(p=1.000 n=1+1)
ParseInfix-27.23µs ± 0%7.30µs ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/One_level-22.42ns ± 0%2.45ns ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/Three_levels-2111ns ± 0%111ns ± 0%~(all equal)
RuntimeScriptNoop-25.10µs ± 0%5.15µs ± 0%~(p=1.000 n=1+1)
SuperTypeInference/arrays-2325ns ± 0%311ns ± 0%~(p=1.000 n=1+1)
SuperTypeInference/composites-2140ns ± 0%142ns ± 0%~(p=1.000 n=1+1)
SuperTypeInference/integers-2159ns ± 0%158ns ± 0%~(p=1.000 n=1+1)
ValueIsSubtypeOfSemaType-292.5ns ± 0%89.7ns ± 0%~(p=1.000 n=1+1)
 
alloc/opdelta
DecodeBatchEventsCCF-266.1MB ± 0%66.1MB ± 0%~(p=1.000 n=1+1)
DecodeBatchEventsJSON-2244MB ± 0%244MB ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowFees.FeesDeducted-21.39kB ± 0%1.39kB ± 0%~(all equal)
DecodeCCF/FlowFees.TokensWithdrawn-21.20kB ± 0%1.20kB ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.DelegatorRewardsPaid-21.47kB ± 0%1.47kB ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.EpochTotalRewardsPaid-21.48kB ± 0%1.48kB ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.NewWeeklyPayout-21.25kB ± 0%1.25kB ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.RewardsPaid-21.37kB ± 0%1.37kB ± 0%~(all equal)
DecodeCCF/FlowToken.TokensDeposited-21.31kB ± 0%1.31kB ± 0%~(all equal)
DecodeCCF/FlowToken.TokensDeposited_with_nil_receiver-21.30kB ± 0%1.30kB ± 0%~(all equal)
DecodeCCF/FlowToken.TokensMinted-21.20kB ± 0%1.20kB ± 0%~(all equal)
DecodeCCF/FlowToken.TokensWithdrawn-21.32kB ± 0%1.32kB ± 0%~(all equal)
DecodeJSON/FlowFees.FeesDeducted-26.00kB ± 0%6.00kB ± 0%~(all equal)
DecodeJSON/FlowFees.TokensWithdrawn-23.60kB ± 0%3.60kB ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.DelegatorRewardsPaid-25.43kB ± 0%5.43kB ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.EpochTotalRewardsPaid-27.35kB ± 0%7.35kB ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.NewWeeklyPayout-23.64kB ± 0%3.64kB ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.RewardsPaid-24.54kB ± 0%4.54kB ± 0%~(all equal)
DecodeJSON/FlowToken.TokensDeposited-24.88kB ± 0%4.88kB ± 0%~(all equal)
DecodeJSON/FlowToken.TokensDeposited_with_nil_receiver-24.46kB ± 0%4.46kB ± 0%~(all equal)
DecodeJSON/FlowToken.TokensMinted-23.60kB ± 0%3.60kB ± 0%~(all equal)
DecodeJSON/FlowToken.TokensWithdrawn-24.88kB ± 0%4.88kB ± 0%~(all equal)
EncodeBatchEventsCCF-262.4MB ± 0%62.4MB ± 0%~(p=1.000 n=1+1)
EncodeBatchEventsJSON-239.1MB ± 0%39.1MB ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowFees.FeesDeducted-21.22kB ± 0%1.22kB ± 0%~(all equal)
EncodeCCF/FlowFees.TokensWithdrawn-21.17kB ± 0%1.17kB ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.DelegatorRewardsPaid-21.44kB ± 0%1.44kB ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.EpochTotalRewardsPaid-21.41kB ± 0%1.41kB ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.NewWeeklyPayout-21.34kB ± 0%1.34kB ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.RewardsPaid-21.42kB ± 0%1.42kB ± 0%~(all equal)
EncodeCCF/FlowToken.TokensDeposited-21.22kB ± 0%1.22kB ± 0%~(all equal)
EncodeCCF/FlowToken.TokensDeposited_with_nil_receiver-21.20kB ± 0%1.20kB ± 0%~(all equal)
EncodeCCF/FlowToken.TokensMinted-21.17kB ± 0%1.17kB ± 0%~(all equal)
EncodeCCF/FlowToken.TokensWithdrawn-21.22kB ± 0%1.22kB ± 0%~(all equal)
EncodeJSON/FlowFees.FeesDeducted-2864B ± 0%864B ± 0%~(all equal)
EncodeJSON/FlowFees.TokensWithdrawn-2504B ± 0%504B ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.DelegatorRewardsPaid-2888B ± 0%888B ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.EpochTotalRewardsPaid-21.08kB ± 0%1.08kB ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.NewWeeklyPayout-2552B ± 0%552B ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.RewardsPaid-2752B ± 0%752B ± 0%~(all equal)
EncodeJSON/FlowToken.TokensDeposited-2776B ± 0%776B ± 0%~(all equal)
EncodeJSON/FlowToken.TokensDeposited_with_nil_receiver-2640B ± 0%640B ± 0%~(all equal)
EncodeJSON/FlowToken.TokensMinted-2512B ± 0%512B ± 0%~(all equal)
EncodeJSON/FlowToken.TokensWithdrawn-2768B ± 0%768B ± 0%~(all equal)
ExportType/composite_type-2120B ± 0%120B ± 0%~(all equal)
ExportType/simple_type-20.00B 0.00B ~(all equal)
InterpretRecursionFib-21.00MB ± 0%1.00MB ± 0%~(all equal)
NewInterpreter/new_interpreter-2928B ± 0%928B ± 0%~(all equal)
NewInterpreter/new_sub-interpreter-2200B ± 0%200B ± 0%~(all equal)
ParseArray-22.80MB ± 0%2.80MB ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-24.09MB ± 0%4.09MB ± 0%~(p=1.000 n=1+1)
ParseDeploy/decode_hex-2214kB ± 0%214kB ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/With_memory_metering-229.7kB ± 0%29.7kB ± 0%~(all equal)
ParseFungibleToken/Without_memory_metering-229.7kB ± 0%29.7kB ± 0%~(p=1.000 n=1+1)
ParseInfix-21.92kB ± 0%1.92kB ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/One_level-20.00B 0.00B ~(all equal)
QualifiedIdentifierCreation/Three_levels-264.0B ± 0%64.0B ± 0%~(all equal)
RuntimeScriptNoop-23.21kB ± 0%3.21kB ± 0%~(all equal)
SuperTypeInference/arrays-296.0B ± 0%96.0B ± 0%~(all equal)
SuperTypeInference/composites-20.00B 0.00B ~(all equal)
SuperTypeInference/integers-20.00B 0.00B ~(all equal)
ValueIsSubtypeOfSemaType-248.0B ± 0%48.0B ± 0%~(all equal)
 
allocs/opdelta
DecodeBatchEventsCCF-21.48M ± 0%1.48M ± 0%~(p=1.000 n=1+1)
DecodeBatchEventsJSON-24.70M ± 0%4.70M ± 0%~(p=1.000 n=1+1)
DecodeCCF/FlowFees.FeesDeducted-230.0 ± 0%30.0 ± 0%~(all equal)
DecodeCCF/FlowFees.TokensWithdrawn-226.0 ± 0%26.0 ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.DelegatorRewardsPaid-230.0 ± 0%30.0 ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.EpochTotalRewardsPaid-232.0 ± 0%32.0 ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.NewWeeklyPayout-226.0 ± 0%26.0 ± 0%~(all equal)
DecodeCCF/FlowIDTableStaking.RewardsPaid-229.0 ± 0%29.0 ± 0%~(all equal)
DecodeCCF/FlowToken.TokensDeposited-231.0 ± 0%31.0 ± 0%~(all equal)
DecodeCCF/FlowToken.TokensDeposited_with_nil_receiver-229.0 ± 0%29.0 ± 0%~(all equal)
DecodeCCF/FlowToken.TokensMinted-226.0 ± 0%26.0 ± 0%~(all equal)
DecodeCCF/FlowToken.TokensWithdrawn-231.0 ± 0%31.0 ± 0%~(all equal)
DecodeJSON/FlowFees.FeesDeducted-2126 ± 0%126 ± 0%~(all equal)
DecodeJSON/FlowFees.TokensWithdrawn-271.0 ± 0%71.0 ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.DelegatorRewardsPaid-2102 ± 0%102 ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.EpochTotalRewardsPaid-2159 ± 0%159 ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.NewWeeklyPayout-270.0 ± 0%70.0 ± 0%~(all equal)
DecodeJSON/FlowIDTableStaking.RewardsPaid-287.0 ± 0%87.0 ± 0%~(all equal)
DecodeJSON/FlowToken.TokensDeposited-295.0 ± 0%95.0 ± 0%~(all equal)
DecodeJSON/FlowToken.TokensDeposited_with_nil_receiver-286.0 ± 0%86.0 ± 0%~(all equal)
DecodeJSON/FlowToken.TokensMinted-271.0 ± 0%71.0 ± 0%~(all equal)
DecodeJSON/FlowToken.TokensWithdrawn-295.0 ± 0%95.0 ± 0%~(all equal)
EncodeBatchEventsCCF-2950k ± 0%950k ± 0%~(p=1.000 n=1+1)
EncodeBatchEventsJSON-2853k ± 0%853k ± 0%~(p=1.000 n=1+1)
EncodeCCF/FlowFees.FeesDeducted-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeCCF/FlowFees.TokensWithdrawn-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.DelegatorRewardsPaid-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.EpochTotalRewardsPaid-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.NewWeeklyPayout-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeCCF/FlowIDTableStaking.RewardsPaid-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeCCF/FlowToken.TokensDeposited-220.0 ± 0%20.0 ± 0%~(all equal)
EncodeCCF/FlowToken.TokensDeposited_with_nil_receiver-220.0 ± 0%20.0 ± 0%~(all equal)
EncodeCCF/FlowToken.TokensMinted-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeCCF/FlowToken.TokensWithdrawn-220.0 ± 0%20.0 ± 0%~(all equal)
EncodeJSON/FlowFees.FeesDeducted-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeJSON/FlowFees.TokensWithdrawn-212.0 ± 0%12.0 ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.DelegatorRewardsPaid-216.0 ± 0%16.0 ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.EpochTotalRewardsPaid-225.0 ± 0%25.0 ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.NewWeeklyPayout-212.0 ± 0%12.0 ± 0%~(all equal)
EncodeJSON/FlowIDTableStaking.RewardsPaid-215.0 ± 0%15.0 ± 0%~(all equal)
EncodeJSON/FlowToken.TokensDeposited-219.0 ± 0%19.0 ± 0%~(all equal)
EncodeJSON/FlowToken.TokensDeposited_with_nil_receiver-214.0 ± 0%14.0 ± 0%~(all equal)
EncodeJSON/FlowToken.TokensMinted-213.0 ± 0%13.0 ± 0%~(all equal)
EncodeJSON/FlowToken.TokensWithdrawn-218.0 ± 0%18.0 ± 0%~(all equal)
ExportType/composite_type-23.00 ± 0%3.00 ± 0%~(all equal)
ExportType/simple_type-20.00 0.00 ~(all equal)
InterpretRecursionFib-218.9k ± 0%18.9k ± 0%~(all equal)
NewInterpreter/new_interpreter-215.0 ± 0%15.0 ± 0%~(all equal)
NewInterpreter/new_sub-interpreter-24.00 ± 0%4.00 ± 0%~(all equal)
ParseArray-259.6k ± 0%59.6k ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-289.4k ± 0%89.4k ± 0%~(p=1.000 n=1+1)
ParseDeploy/decode_hex-263.0 ± 0%63.0 ± 0%~(all equal)
ParseFungibleToken/With_memory_metering-2778 ± 0%778 ± 0%~(all equal)
ParseFungibleToken/Without_memory_metering-2778 ± 0%778 ± 0%~(all equal)
ParseInfix-248.0 ± 0%48.0 ± 0%~(all equal)
QualifiedIdentifierCreation/One_level-20.00 0.00 ~(all equal)
QualifiedIdentifierCreation/Three_levels-22.00 ± 0%2.00 ± 0%~(all equal)
RuntimeScriptNoop-251.0 ± 0%51.0 ± 0%~(all equal)
SuperTypeInference/arrays-23.00 ± 0%3.00 ± 0%~(all equal)
SuperTypeInference/composites-20.00 0.00 ~(all equal)
SuperTypeInference/integers-20.00 0.00 ~(all equal)
ValueIsSubtypeOfSemaType-21.00 ± 0%1.00 ± 0%~(all equal)
 

@codecov
Copy link

codecov bot commented Sep 27, 2023 •
edited
Loading

Codecov Report

Attention: 20 lines in your changes are missing coverage. Please review.

Comparison is base (fa75807) 79.84% compared to head (a1e43fb) 79.87%.

❗ Current head a1e43fb differs from pull request most recent head a03a452. Consider uploading reports for the commit a03a452 to get more accurate results

Additional details and impacted files 
@@                    Coverage Diff                     @@
##           feature/stable-cadence    #2820      +/-   ##
==========================================================
+ Coverage                   79.84%   79.87%   +0.03%     
==========================================================
  Files                         343      343              
  Lines                       81056    81115      +59     
==========================================================
+ Hits                        64719    64791      +72     
+ Misses                      14027    14018       -9     
+ Partials                     2310     2306       -4
Flag Coverage Δ
unittests 79.87% <92.42%> (+0.03%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
runtime/environment.go 92.70% <100.00%> (+0.51%) ⬆️
runtime/interpreter/interpreter.go 88.34% <100.00%> (+0.08%) ⬆️
runtime/sema/check_remove_statement.go 100.00% <100.00%> (ø)
runtime/stdlib/account.go 89.71% <100.00%> (+0.02%) ⬆️
...e/interpreter/value_accountcapabilitycontroller.go 66.48% <88.00%> (+6.84%) ⬆️
runtime/sema/type.go 89.29% <76.92%> (-0.08%) ⬇️
...e/interpreter/value_storagecapabilitycontroller.go 68.69% <90.12%> (+8.57%) ⬆️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@turbolent turbolent merged commit 29bf615 into feature/stable-cadence Sep 27, 2023
8 of 9 checks passed
@turbolent turbolent deleted the bastian/sync-stable-cadence-8 branch September 27, 2023 19:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SupunS SupunS SupunS approved these changes

@dsainati1 dsainati1 dsainati1 approved these changes

Assignees

@turbolent turbolent

Labels
Chore
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@turbolent @dsainati1 @SupunS @m-Peter