Extract type requirements from old code for staged contracts #1705
Conversation
| @@ -187,10 +190,12 @@ func (v *stagingValidatorImpl) Validate(stagedContracts []stagedContractUpdate) | |||
|
|
|||
| v.stagedContracts = make(map[common.AddressLocation]stagedContractUpdate) | |||
| for _, stagedContract := range stagedContracts { | |||
| v.stagedContracts[stagedContract.DeployLocation] = stagedContract | |||
| stagedContractLocation := stagedContract.DeployLocation | |||
There was a problem hiding this comment.
contract update validator relies on typeIDs. So had to use the DeployLocation in all places, instead of SourceLocation
There was a problem hiding this comment.
This is also needed to fix https://discord.com/channels/613813861610684416/1277718471618330707/1277750460723363911
There was a problem hiding this comment.
Added a dedicated test for ^above: bd87b9f
SupunS
added
the
Improvement
SupunS
changed the title
SupunS
force-pushed
the
supun/support-type-requirements
branch
from
7c5d6c1 to
68d9ad5
Compare
SupunS
force-pushed
the
supun/support-type-requirements
branch
from
68d9ad5 to
091c693
Compare
| typeRequirements := &migrations.LegacyTypeRequirements{} | ||
|
|
||
| // Extract type requirements from the old codes for all staged contracts. | ||
| for _, contract := range v.stagedContracts { |
There was a problem hiding this comment.
Actual improvement is this block: extract type requirements from old code
| // If the contract one of our staged contract updates, use the source location | ||
| if stagedUpdate, ok := v.stagedContracts[resovledAddrLocation]; ok { | ||
| resolvedLocation = stagedUpdate.SourceLocation | ||
| } else { | ||
| resolvedLocation = resovledAddrLocation | ||
| } | ||
|
|
There was a problem hiding this comment.
I think there is no need to separate the staged contracts vs other contracts now, given staged contracts also uses DeployLocation, which is an address location.
|
This PR/issue depends on: |
…n/support-type-requirements
SupunS
requested review from
Kay-Zee,
janezpodhostnik,
sideninja,
chasefleming,
nvdtf,
bluesign,
bjartek and
jribbink
as code owners
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1705 +/- ##
==========================================
- Coverage 34.32% 34.15% -0.18%
==========================================
Files 100 100
Lines 6368 6386 +18
==========================================
- Hits 2186 2181 -5
- Misses 3894 3922 +28
+ Partials 288 283 -5
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Work towards supporting onflow/cadence#3527 in Flow CLI.
i.e: integrating onflow/flow-go#6341 to the CLI.
Description
Depends on onflow/flow-go#6395
For contributor use:
masterbranchFiles changedin the Github PR explorer