Skip to content

Commit

Permalink
fix changes in api
Browse files Browse the repository at this point in the history
  • Loading branch information
sideninja committed Apr 30, 2024
1 parent 195d001 commit 23ba504
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
6 changes: 3 additions & 3 deletions internal/migrate/staging_validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import (
"fmt"
"strings"

"github.com/onflow/flow-cli/internal/util"

"github.com/onflow/cadence"
"github.com/onflow/cadence/runtime"
"github.com/onflow/cadence/runtime/ast"
Expand All @@ -40,6 +38,8 @@ import (
"github.com/onflow/flow-go/cmd/util/ledger/migrations"
"github.com/onflow/flow-go/model/flow"
"github.com/onflow/flowkit/v2"

"github.com/onflow/flow-cli/internal/util"
)

type stagingValidator struct {
Expand Down Expand Up @@ -307,7 +307,7 @@ func (v *stagingValidator) loadSystemContracts() {
return
}

stagedSystemContracts := migrations.SystemContractChanges(chainId, migrations.SystemContractChangesOptions{
stagedSystemContracts := migrations.SystemContractChanges(chainId, migrations.SystemContractsMigrationOptions{
Burner: migrations.BurnerContractChangeUpdate, // needs to be update for now since BurnerChangeDeploy is a no-op in flow-go
EVM: migrations.EVMContractChangeFull,
})
Expand Down
12 changes: 4 additions & 8 deletions internal/migrate/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,20 @@ import (
"fmt"
"os"

"github.com/rs/zerolog"
"github.com/spf13/cobra"

"github.com/onflow/cadence"
"github.com/onflow/cadence/runtime/common"

"github.com/onflow/flow-emulator/storage/migration"
emulatorMigrate "github.com/onflow/flow-emulator/storage/migration"
"github.com/onflow/flow-emulator/storage/sqlite"

"github.com/onflow/flow-go-sdk"
"github.com/onflow/flow-go/cmd/util/ledger/migrations"
"github.com/onflow/flow-go/cmd/util/ledger/reporters"

"github.com/onflow/flowkit/v2"
"github.com/onflow/flowkit/v2/config"
"github.com/onflow/flowkit/v2/output"
"github.com/onflow/flowkit/v2/project"

"github.com/onflow/flow-go-sdk"
"github.com/rs/zerolog"
"github.com/spf13/cobra"

"github.com/onflow/flow-cli/internal/command"
)
Expand Down Expand Up @@ -99,6 +94,7 @@ func migrateState(

err = emulatorMigrate.MigrateCadence1(
store,
stateFlags.SaveReport,
migrations.EVMContractChangeNone,
migrations.BurnerContractChangeDeploy,
contracts,
Expand Down

0 comments on commit 23ba504

Please sign in to comment.