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

Add staged contracts as argument for Cadence 1.0 state migration #581

Merged
merged 2 commits into from
Feb 26, 2024
Merged

Add staged contracts as argument for Cadence 1.0 state migration #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8a983f
Add staged contracts as argument for Cadence 1.0 state migration
jribbink Feb 26, 2024
a96827e
Merge branch 'master' into jribbink/staged-contracts
turbolent Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions storage/migration/cadence1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (

func MigrateCadence1(
store *sqlite.Store,
stagedContracts []migrations.StagedContract,
rwf reporters.ReportWriterFactory,
logger zerolog.Logger,
) error {
Expand All @@ -46,9 +47,6 @@ func MigrateCadence1(
// TODO: EVM contract is not deployed in snapshot yet, so can't update it
const evmContractChange = migrations.EVMContractChangeNone

// TODO:
var stagedContracts []migrations.StagedContract

cadence1Migrations := migrations.NewCadence1Migrations(
logger,
rwf,
Expand Down
2 changes: 1 addition & 1 deletion storage/migration/cadence1_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func TestCadence1Migration(t *testing.T) {

// Then migrate the values.
rwf := &NOOPReportWriterFactory{}
err = MigrateCadence1(store, rwf, logger)
err = MigrateCadence1(store, nil, rwf, logger)
require.NoError(t, err)

require.Empty(t, logWriter.logs)
Expand Down
Loading