fix migrate

fix test fix lint test param
crypto-org-chain · Sep 27, 2023 · 9a2f531 · 9a2f531
1 parent bcf4663
commit 9a2f531
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/integration_tests/test_upgrade.py b/integration_tests/test_upgrade.py
@@ -186,6 +186,7 @@ def test_cosmovisor_upgrade(custom_cronos: Cronos, tmp_path_factory):
 
  rsp = cli.query_params("icaauth")
  assert rsp["params"]["min_timeout_duration"] == "3600s", rsp
+ assert cli.query_params()["max_callback_gas"] == "300000", rsp
 
  # migrate to sdk v0.47
  custom_cronos.supervisorctl("stop", "all")

diff --git a/x/cronos/exported/exported.go b/x/cronos/exported/exported.go
@@ -13,6 +13,6 @@ type (
  //
  // NOTE: This is used solely for migration of x/params managed parameters.
  Subspace interface {
- GetParamSet(ctx sdk.Context, ps ParamSet)
+ GetParamSetIfExists(ctx sdk.Context, ps ParamSet)
  }
 )
diff --git a/x/cronos/migrations/v2/migrate.go b/x/cronos/migrations/v2/migrate.go
@@ -13,12 +13,14 @@ import (
 // module state.
 func Migrate(ctx sdk.Context, store sdk.KVStore, legacySubspace exported.Subspace, cdc codec.BinaryCodec) error {
  var currParams types.Params
- legacySubspace.GetParamSet(ctx, &currParams)
+ legacySubspace.GetParamSetIfExists(ctx, &currParams)
 
  if err := currParams.Validate(); err != nil {
  return err
  }
-
+ if currParams.GetMaxCallbackGas() == 0 {
+ currParams.MaxCallbackGas = types.MaxCallbackGasDefaultValue
+ }
  bz := cdc.MustMarshal(&currParams)
  store.Set(types.ParamsKey, bz)
 

diff --git a/x/cronos/migrations/v2/migrate_test.go b/x/cronos/migrations/v2/migrate_test.go
@@ -20,7 +20,7 @@ func newMockSubspace(ps types.Params) mockSubspace {
  return mockSubspace{ps: ps}
 }
 
-func (ms mockSubspace) GetParamSet(ctx sdk.Context, ps exported.ParamSet) {
+func (ms mockSubspace) GetParamSetIfExists(ctx sdk.Context, ps exported.ParamSet) {
  *ps.(*types.Params) = ms.ps
 }