chore: clean-up main

cosmos · Dec 6, 2024 · df70c65 · df70c65
1 parent 3a2a0ac
commit df70c65
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 1,050 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -50,8 +50,8 @@ jobs:
         ###################
       - name: Build
         run: GOARCH=${{ matrix.go-arch }} make build
-      - name: Build Legacy
-        run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS=legacy make build
+      - name: Build v2
+        run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS=v2 make build
       - name: Build with rocksdb backend
         if: matrix.go-arch == 'amd64'
         run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS="rocksdb" make build

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -526,11 +526,6 @@ jobs:
         run: |
           cd simapp
           go test -mod=readonly -timeout 30m -tags='norace ledger test_ledger_mock' ./...
-      - name: tests simapp v1
-        if: env.GIT_DIFF
-        run: |
-          cd simapp
-          go test -mod=readonly -timeout 30m -tags='app_v1 norace ledger test_ledger_mock' ./...
 
   test-simapp-v2:
     runs-on: ubuntu-latest

diff --git a/scripts/build/build.mk b/scripts/build/build.mk
@@ -48,10 +48,6 @@ ifeq (secp,$(findstring secp,$(COSMOS_BUILD_OPTIONS)))
   build_tags += libsecp256k1_sdk
 endif
 
-ifeq (legacy,$(findstring legacy,$(COSMOS_BUILD_OPTIONS)))
-  build_tags += app_v1
-endif
-
 ifeq (v2,$(findstring v2,$(COSMOS_BUILD_OPTIONS)))
   SIMAPP = simapp/v2
   APPNAME = simdv2

diff --git a/scripts/go-lint-all.bash b/scripts/go-lint-all.bash
@@ -21,11 +21,6 @@ lint_module() {
   fi
   echo "linting $(grep "^module" go.mod) [$(date -Iseconds -u)]"
   golangci-lint run ./... -c "${REPO_ROOT}/.golangci.yml" "$@" --build-tags=${LINT_TAGS}
-
-  # always lint simapp with app_v1 build tag, otherwise it never gets linted
-  if [[ "$(grep "^module" go.mod)" == "module cosmossdk.io/simapp" ]]; then
-    golangci-lint run ./... -c "${REPO_ROOT}/.golangci.yml" "$@" --build-tags=app_v1
-  fi
 }
 export -f lint_module
 

diff --git a/simapp/CHANGELOG.md b/simapp/CHANGELOG.md
@@ -47,7 +47,7 @@ Always refer to the [UPGRADING.md](https://github.com/cosmos/cosmos-sdk/blob/mai
 * [#19726](https://github.com/cosmos/cosmos-sdk/pull/19726) Update APIs to match CometBFT v1.
 * [#21466](https://github.com/cosmos/cosmos-sdk/pull/21466) Allow chains to plug in their own public key types in `base.Account`
 * [#21508](https://github.com/cosmos/cosmos-sdk/pull/21508) Abstract the way we update the version of the app state in `app.go` using the interface `VersionModifier`.
- 
+
 <!-- TODO: move changelog.md elements to here -->
 
 ## v0.47 to v0.50