Merge branch 'main' into julien/nits

cosmos · Feb 24, 2024 · d804a02 · d804a02
2 parents b0a8d35 + 95cc64b
commit d804a02
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 399 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,5 +1,4 @@
 name: Build SimApp
-#  This workflow is run on pushes to main & every Pull Requests where a .go, .mod, .sum have been changed
 on:
   pull_request:
   merge_group:
@@ -28,28 +27,12 @@ jobs:
         with:
           go-version: "1.22"
           check-latest: true
-      - uses: technote-space/get-diff-action@v6.1.2
-        id: git_diff
-        with:
-          PATTERNS: |
-            **/*.go
-            go.mod
-            go.sum
-            **/go.mod
-            **/go.sum
-            **/Makefile
-            Makefile
-            flake.lock
-            flake.nix
-            simapp/default.nix
         ###################
         #### Build App ####
         ###################
       - name: Build
-        if: env.GIT_DIFF
         run: GOARCH=${{ matrix.go-arch }} make build
       - name: Build Legacy
-        if: env.GIT_DIFF
         run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS=legacy make build
       - name: Build with rocksdb backend
         if: |
@@ -60,11 +43,8 @@ jobs:
         ## Build Tooling ##
         ###################
       - name: Build Cosmovisor
-        if: env.GIT_DIFF
         run: GOARCH=${{ matrix.go-arch }} make cosmovisor
       - name: Build Confix
-        if: env.GIT_DIFF
         run: GOARCH=${{ matrix.go-arch }} make confix
       - name: Build Hubl
-        if: env.GIT_DIFF
         run: GOARCH=${{ matrix.go-arch }} make hubl
diff --git a/simapp/app.go b/simapp/app.go
@@ -711,7 +711,7 @@ func (app *SimApp) GetKey(storeKey string) *storetypes.KVStoreKey {
 
 // GetStoreKeys returns all the stored store keys.
 func (app *SimApp) GetStoreKeys() []storetypes.StoreKey {
-	keys := make([]storetypes.StoreKey, len(app.keys))
+	keys := make([]storetypes.StoreKey, 0, len(app.keys))
 	for _, key := range app.keys {
 		keys = append(keys, key)
 	}

diff --git a/tests/integration/rapidgen/rapidgen.go b/tests/integration/rapidgen/rapidgen.go
@@ -218,11 +218,6 @@ var (
 		// upgrade
 		GenType(&upgradetypes.MsgSoftwareUpgrade{}, &upgradeapi.MsgSoftwareUpgrade{}, GenOpts.WithDisallowNil()),
 		GenType(&upgradetypes.MsgCancelUpgrade{}, &upgradeapi.MsgCancelUpgrade{}, GenOpts),
-
-		// vesting
-		GenType(&vestingtypes.MsgCreateVestingAccount{}, &vestingapi.MsgCreateVestingAccount{}, GenOpts),
-		GenType(&vestingtypes.MsgCreatePermanentLockedAccount{}, &vestingapi.MsgCreatePermanentLockedAccount{}, GenOpts),
-		GenType(&vestingtypes.MsgCreatePeriodicVestingAccount{}, &vestingapi.MsgCreatePeriodicVestingAccount{}, GenOpts),
 	}
 	NonsignableTypes = []GeneratedType{
 		GenType(&authtypes.Params{}, &authapi.Params{}, GenOpts),

diff --git a/x/auth/vesting/README.md b/x/auth/vesting/README.md
@@ -4,6 +4,11 @@ sidebar_position: 1
 
 # `x/auth/vesting`
 
+:::warning
+This module is deprecated in favor of x/accounts.
+The creation of vesting account, using x/auth/vesting, is not possible since v0.51.
+For existing chains, importing the x/auth/vesting module is still required for backward compatibility purposes.
+:::
 
 * [Intro and Requirements](#intro-and-requirements)
 * [Note](#note)

diff --git a/x/auth/vesting/client/cli/periods.json b/x/auth/vesting/client/cli/periods.json
diff --git a/x/auth/vesting/client/cli/tx.go b/x/auth/vesting/client/cli/tx.go
diff --git a/x/auth/vesting/client/cli/tx_test.go b/x/auth/vesting/client/cli/tx_test.go