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.

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

Update atree inlining cadence v1.0 branch #6216

Conversation

turbolent
Copy link
Member

Merge master into feature/atree-inlining-cadence-v1.0, specifically @ aa5cd6a

Conflict resolution:
commit 2c98ccebed447e2512bca646ce90267ff9d376ce
Merge: 37a0b1a096 aa5cd6ac03
Author: Bastian Müller <[email protected]>
Date:   Fri Jul 12 15:06:54 2024 -0700

    Merge commit 'aa5cd6ac03601533604280dfb79cf356dcac4bec' into bastian/update-atree-inlining-cadence-v1.0-13

diff --git a/go.mod b/go.mod
remerge CONFLICT (content): Merge conflict in go.mod
index 21bad71a61..11e22c0283 100644
--- a/go.mod
+++ b/go.mod
@@ -46,13 +46,8 @@ require (
 	github.com/multiformats/go-multiaddr v0.12.2
 	github.com/multiformats/go-multiaddr-dns v0.3.1
 	github.com/multiformats/go-multihash v0.2.3
-<<<<<<< 37a0b1a096 (Merge pull request #6187 from onflow/bastian/update-atree-inlining-cadence-v1.0-12)
 	github.com/onflow/atree v0.8.0-rc.3
-	github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36
-=======
-	github.com/onflow/atree v0.7.0-rc.2
-	github.com/onflow/cadence v1.0.0-preview.37
->>>>>>> aa5cd6ac03 (Merge pull request #6212 from onflow/auto-update-onflow-cadence-v1.0.0-preview.37)
+	github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.37
 	github.com/onflow/crypto v0.25.1
 	github.com/onflow/flow v0.3.4
 	github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.0
diff --git a/go.sum b/go.sum
remerge CONFLICT (content): Merge conflict in go.sum
index a6bb8747d8..972226fadf 100644
--- a/go.sum
+++ b/go.sum
@@ -2171,13 +2171,8 @@ github.com/onflow/atree v0.8.0-rc.3/go.mod h1:7YNAyCd5JENq+NzH+fR1ABUZVzbSq9dkt0
 github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483 h1:LpiQhTAfM9CAmNVEs0n//cBBgCg+vJSiIxTHYUklZ84=
 github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
 github.com/onflow/cadence v1.0.0-M3/go.mod h1:odXGZZ/wGNA5mwT8bC9v8u8EXACHllB2ABSZK65TGL8=
-<<<<<<< 37a0b1a096 (Merge pull request #6187 from onflow/bastian/update-atree-inlining-cadence-v1.0-12)
-github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36 h1:/aj7ciF9itu0GYTfrxU5wmonJ2eGx4yhpwFx+CmUeIM=
-github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36/go.mod h1:zyl2lWOLVKiKt8BoGAModCHqFEivJ44Y7Myx6NwND7o=
-=======
-github.com/onflow/cadence v1.0.0-preview.37 h1:CclIG7GXEBJCwk5d5jumJ6cU8xj/Q1A9cfVJKIxvLH8=
-github.com/onflow/cadence v1.0.0-preview.37/go.mod h1:jOwvPSSLTr9TvaKMs7KKiBYMmpdpNNAFxBsjMlrqVD0=
->>>>>>> aa5cd6ac03 (Merge pull request #6212 from onflow/auto-update-onflow-cadence-v1.0.0-preview.37)
+github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.37 h1:f+HIcy7uqooRc8f+e+lh1RTW7mORNpdPrB9hS2m96JE=
+github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.37/go.mod h1:zyl2lWOLVKiKt8BoGAModCHqFEivJ44Y7Myx6NwND7o=
 github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
 github.com/onflow/crypto v0.25.1 h1:0txy2PKPMM873JbpxQNbJmuOJtD56bfs48RQfm0ts5A=
 github.com/onflow/crypto v0.25.1/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
diff --git a/insecure/go.mod b/insecure/go.mod
remerge CONFLICT (content): Merge conflict in insecure/go.mod
index 95bd805238..083be355c5 100644
--- a/insecure/go.mod
+++ b/insecure/go.mod
@@ -198,13 +198,8 @@ require (
 	github.com/multiformats/go-multistream v0.5.0 // indirect
 	github.com/multiformats/go-varint v0.0.7 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
-<<<<<<< 37a0b1a096 (Merge pull request #6187 from onflow/bastian/update-atree-inlining-cadence-v1.0-12)
 	github.com/onflow/atree v0.8.0-rc.3 // indirect
-	github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36 // indirect
-=======
-	github.com/onflow/atree v0.7.0-rc.2 // indirect
-	github.com/onflow/cadence v1.0.0-preview.37 // indirect
->>>>>>> aa5cd6ac03 (Merge pull request #6212 from onflow/auto-update-onflow-cadence-v1.0.0-preview.37)
+	github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.37 // indirect
 	github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.0 // indirect
 	github.com/onflow/flow-core-contracts/lib/go/templates v1.3.0 // indirect
 	github.com/onflow/flow-ft/lib/go/contracts v1.0.0 // indirect
diff --git a/insecure/go.sum b/insecure/go.sum
remerge CONFLICT (content): Merge conflict in insecure/go.sum
index 27a710bff7..3c3fffeba9 100644
--- a/insecure/go.sum
+++ b/insecure/go.sum
@@ -2160,13 +2160,8 @@ github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f/go.mod h1:xvP61FoOs
 github.com/onflow/atree v0.8.0-rc.3 h1:BHVkJLrBHhHo7ET8gkuS1+lyQGNekYYOyoICGK3RFNM=
 github.com/onflow/atree v0.8.0-rc.3/go.mod h1:7YNAyCd5JENq+NzH+fR1ABUZVzbSq9dkt0+5fZH3L2A=
 github.com/onflow/cadence v1.0.0-M3/go.mod h1:odXGZZ/wGNA5mwT8bC9v8u8EXACHllB2ABSZK65TGL8=
-<<<<<<< 37a0b1a096 (Merge pull request #6187 from onflow/bastian/update-atree-inlining-cadence-v1.0-12)
-github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36 h1:/aj7ciF9itu0GYTfrxU5wmonJ2eGx4yhpwFx+CmUeIM=
-github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36/go.mod h1:zyl2lWOLVKiKt8BoGAModCHqFEivJ44Y7Myx6NwND7o=
-=======
-github.com/onflow/cadence v1.0.0-preview.37 h1:CclIG7GXEBJCwk5d5jumJ6cU8xj/Q1A9cfVJKIxvLH8=
-github.com/onflow/cadence v1.0.0-preview.37/go.mod h1:jOwvPSSLTr9TvaKMs7KKiBYMmpdpNNAFxBsjMlrqVD0=
->>>>>>> aa5cd6ac03 (Merge pull request #6212 from onflow/auto-update-onflow-cadence-v1.0.0-preview.37)
+github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.37 h1:f+HIcy7uqooRc8f+e+lh1RTW7mORNpdPrB9hS2m96JE=
+github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.37/go.mod h1:zyl2lWOLVKiKt8BoGAModCHqFEivJ44Y7Myx6NwND7o=
 github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
 github.com/onflow/crypto v0.25.1 h1:0txy2PKPMM873JbpxQNbJmuOJtD56bfs48RQfm0ts5A=
 github.com/onflow/crypto v0.25.1/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
diff --git a/integration/go.mod b/integration/go.mod
remerge CONFLICT (content): Merge conflict in integration/go.mod
index d1ba5f2645..6bc67d6a05 100644
--- a/integration/go.mod
+++ b/integration/go.mod
@@ -19,11 +19,7 @@ require (
 	github.com/ipfs/go-datastore v0.6.0
 	github.com/ipfs/go-ds-badger2 v0.1.3
 	github.com/libp2p/go-libp2p v0.32.2
-<<<<<<< 37a0b1a096 (Merge pull request #6187 from onflow/bastian/update-atree-inlining-cadence-v1.0-12)
-	github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36
-=======
-	github.com/onflow/cadence v1.0.0-preview.37
->>>>>>> aa5cd6ac03 (Merge pull request #6212 from onflow/auto-update-onflow-cadence-v1.0.0-preview.37)
+	github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.37
 	github.com/onflow/crypto v0.25.1
 	github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.0
 	github.com/onflow/flow-core-contracts/lib/go/templates v1.3.0
diff --git a/integration/go.sum b/integration/go.sum
remerge CONFLICT (content): Merge conflict in integration/go.sum
index 7f109eecd4..af66a30235 100644
--- a/integration/go.sum
+++ b/integration/go.sum
@@ -2150,13 +2150,8 @@ github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f/go.mod h1:xvP61FoOs
 github.com/onflow/atree v0.8.0-rc.3 h1:BHVkJLrBHhHo7ET8gkuS1+lyQGNekYYOyoICGK3RFNM=
 github.com/onflow/atree v0.8.0-rc.3/go.mod h1:7YNAyCd5JENq+NzH+fR1ABUZVzbSq9dkt0+5fZH3L2A=
 github.com/onflow/cadence v1.0.0-M3/go.mod h1:odXGZZ/wGNA5mwT8bC9v8u8EXACHllB2ABSZK65TGL8=
-<<<<<<< 37a0b1a096 (Merge pull request #6187 from onflow/bastian/update-atree-inlining-cadence-v1.0-12)
-github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36 h1:/aj7ciF9itu0GYTfrxU5wmonJ2eGx4yhpwFx+CmUeIM=
-github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.36/go.mod h1:zyl2lWOLVKiKt8BoGAModCHqFEivJ44Y7Myx6NwND7o=
-=======
-github.com/onflow/cadence v1.0.0-preview.37 h1:CclIG7GXEBJCwk5d5jumJ6cU8xj/Q1A9cfVJKIxvLH8=
-github.com/onflow/cadence v1.0.0-preview.37/go.mod h1:jOwvPSSLTr9TvaKMs7KKiBYMmpdpNNAFxBsjMlrqVD0=
->>>>>>> aa5cd6ac03 (Merge pull request #6212 from onflow/auto-update-onflow-cadence-v1.0.0-preview.37)
+github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.37 h1:f+HIcy7uqooRc8f+e+lh1RTW7mORNpdPrB9hS2m96JE=
+github.com/onflow/cadence v1.0.0-preview-atree-register-inlining.37/go.mod h1:zyl2lWOLVKiKt8BoGAModCHqFEivJ44Y7Myx6NwND7o=
 github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
 github.com/onflow/crypto v0.25.1 h1:0txy2PKPMM873JbpxQNbJmuOJtD56bfs48RQfm0ts5A=
 github.com/onflow/crypto v0.25.1/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=

AndriiDiachuk and others added 30 commits June 19, 2024 17:15
Co-authored-by: Jordan Schalm <[email protected]>
Co-authored-by: Janez Podhostnik <[email protected]>
Co-authored-by: Leo Zhang <[email protected]>
@codecov-commenter
Copy link

codecov-commenter commented Jul 12, 2024

Codecov Report

Attention: Patch coverage is 16.74975% with 835 lines in your changes missing coverage. Please review.

Project coverage is 41.38%. Comparing base (37a0b1a) to head (2c98cce).

Files Patch % Lines
engine/access/mock/access_api_client.go 0.00% 144 Missing ⚠️
engine/access/mock/access_api_server.go 0.00% 108 Missing ⚠️
access/mock/api.go 0.00% 106 Missing ⚠️
access/handler.go 0.00% 102 Missing ⚠️
engine/access/apiproxy/access_api_proxy.go 0.00% 84 Missing ⚠️
engine/access/rpc/backend/backend_accounts.go 47.18% 51 Missing and 24 partials ⚠️
engine/execution/computation/query/executor.go 0.00% 37 Missing ⚠️
...ngine/execution/computation/query/mock/executor.go 0.00% 35 Missing ⚠️
module/execution/mock/script_executor.go 0.00% 35 Missing ⚠️
fvm/environment/mock/tracer.go 0.00% 21 Missing ⚠️
... and 10 more
Additional details and impacted files
@@                           Coverage Diff                           @@
##           feature/atree-inlining-cadence-v1.0    #6216      +/-   ##
=======================================================================
- Coverage                                41.62%   41.38%   -0.25%     
=======================================================================
  Files                                     1975     1976       +1     
  Lines                                   139817   140616     +799     
=======================================================================
- Hits                                     58200    58194       -6     
- Misses                                   75580    76363     +783     
- Partials                                  6037     6059      +22     
Flag Coverage Δ
unittests 41.38% <16.74%> (-0.25%) ⬇️

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

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

@fxamacker fxamacker merged commit b730536 into feature/atree-inlining-cadence-v1.0 Jul 15, 2024
55 checks passed
@fxamacker fxamacker deleted the bastian/update-atree-inlining-cadence-v1.0-13 branch July 15, 2024 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants