chore: fix merge conflict

jaeseung-bae · Feb 2, 2024 · c1d6d01 · c1d6d01
1 parent 55e5785
commit c1d6d01
Show file tree

Hide file tree

Showing 20 changed files with 142 additions and 1,015 deletions.
diff --git a/.github/pr_labeler.yml b/.github/pr_labeler.yml
@@ -13,5 +13,7 @@
 #   - x/*/client/**/*
 # "Type: ADR":
 #   - docs/architecture/**/*
+"C:x/foundation":
+  - x/foundation/**/*
 "C:x/bankplus":
   - x/bankplus/**/*
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,6 +43,3 @@ jobs:
       - 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
diff --git a/.github/workflows/pr_labeler.yml b/.github/workflows/pr_labeler.yml
@@ -12,7 +12,7 @@ jobs:
       pull-requests: write  # for actions/labeler to add labels to PRs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@main
+      - uses: actions/labeler@v4
         with:
           configuration-path: .github/pr_labeler.yml
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml
@@ -28,4 +28,4 @@ jobs:
       - uses: bufbuild/buf-breaking-action@v1
         with:
           input: "proto"
-          against: "https://github.com/${{ github.repository }}.git#branch=${{ github.event.pull_request.base.ref }},ref=HEAD~1,subdir=proto"
+          against: "https://github.com/${{ github.repository }}.git#branch=${{ github.event.pull_request.base.ref }},subdir=proto"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -113,40 +113,41 @@ jobs:
   #         name: "${{ github.sha }}-integration-coverage"
   #         path: ./tests/integration-profile.out
 
-  # test-e2e:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: actions/setup-go@v4
-  #       with:
-  #         go-version: "1.21"
-  #         check-latest: true
-  #         cache: true
-  #         cache-dependency-path: go.sum
-  #     - uses: technote-space/[email protected]
-  #       id: git_diff
-  #       with:
-  #         PATTERNS: |
-  #           **/*.go
-  #           go.mod
-  #           go.sum
-  #           **/go.mod
-  #           **/go.sum
-  #           **/Makefile
-  #           Makefile
-  #     - name: e2e tests
-  #       if: env.GIT_DIFF
-  #       run: |
-  #         make test-e2e-cov
-  #     - uses: actions/upload-artifact@v3
-  #       if: env.GIT_DIFF
-  #       with:
-  #         name: "${{ github.sha }}-e2e-coverage"
-  #         path: ./tests/e2e-profile.out
+  test-e2e:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: "1.21"
+          check-latest: true
+          cache: true
+          cache-dependency-path: go.sum
+      - uses: technote-space/[email protected]
+        id: git_diff
+        with:
+          PATTERNS: |
+            **/*.go
+            go.mod
+            go.sum
+            **/go.mod
+            **/go.sum
+            **/Makefile
+            Makefile
+      - name: e2e tests
+        if: env.GIT_DIFF
+        run: |
+          make test-e2e-cov
+      - uses: actions/upload-artifact@v3
+        if: env.GIT_DIFF
+        with:
+          name: "${{ github.sha }}-e2e-coverage"
+          path: ./tests/e2e-profile.out
 
   repo-analysis:
     runs-on: ubuntu-latest
-    needs: [tests, test-integration, test-e2e]
+    # needs: [tests, test-integration, test-e2e]
+    needs: [ tests, test-e2e ]
     steps:
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]
@@ -178,11 +179,11 @@ jobs:
       #   if: env.GIT_DIFF
       #   with:
       #     name: "${{ github.sha }}-integration-coverage"
-      # - uses: actions/download-artifact@v3
-      #   if: env.GIT_DIFF
-      #   with:
-      #     name: "${{ github.sha }}-e2e-coverage"
-      #   continue-on-error: true
+      - uses: actions/download-artifact@v3
+        if: env.GIT_DIFF
+        with:
+          name: "${{ github.sha }}-e2e-coverage"
+        continue-on-error: true
       - name: sonarcloud
         if: ${{ env.GIT_DIFF && !github.event.pull_request.draft }}
         uses: SonarSource/sonarcloud-github-action@master
@@ -276,11 +277,6 @@ jobs:
         run: |
           cd simapp
           go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb_build' ./...
-      - 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 rocksdb_build' ./...
       - name: sonarcloud
         if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }}
         uses: SonarSource/sonarcloud-github-action@master
@@ -297,6 +293,37 @@ jobs:
   # NOTE: The following jobs are used to test the Finschia SDK Go submodules present under x/{module}.
   # They run when there is a diff in their respective directories.
 
+  test-x-foundation:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: "1.21"
+          check-latest: true
+          cache: true
+          cache-dependency-path: x/foundation/go.sum
+      - uses: technote-space/[email protected]
+        id: git_diff
+        with:
+          PATTERNS: |
+            x/foundation/**/*.go
+            x/foundation/go.mod
+            x/foundation/go.sum
+      - name: tests
+        if: env.GIT_DIFF
+        run: |
+          cd x/foundation
+          go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb_build' ./...
+      - name: sonarcloud
+        if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }}
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          projectBaseDir: x/foundation/
+
   test-x-bankplus:
     runs-on: ubuntu-latest
     steps:

diff --git a/.golangci.yml b/.golangci.yml
@@ -52,6 +52,10 @@ issues:
     - text: "SA1019: codec.NewAminoCodec is deprecated" # TODO remove once migration path is set out
       linters:
         - staticcheck
+    - path: "client/cli"  # TODO(@0Tech): remove after foundation exec proposal removed
+      text: "SA1019: govcli.FlagDescription is deprecated"
+      linters:
+        - staticcheck
     - text: "leading space"
       linters:
         - nolintlint

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,10 +40,12 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ## [Unreleased](https://github.com/Finschia/finschia-sdk/compare/v0.48.0...HEAD)
 
 ### Features
+
+* (x/foundation) [\#1198](https://github.com/Finschia/finschia-sdk/pull/1198) update x/foundation to use
+  Finschia/cosmos-sdk
 * (all) [\#1205](https://github.com/Finschia/finschia-sdk/pull/1205) delegate native logics to Finschia/cosmos-sdk
 * (consensus) [\#1178](https://github.com/Finschia/finschia-sdk/pull/1178) change the consensus from Ostracon to Tendermint v0.34.24
 * (x/bankplus) [\#1223](https://github.com/Finschia/finschia-sdk/pull/1223) update x/bankplus to use Finschia/cosmos-sdk
-*
 
 ### Improvements
 * (docs) [\#1120](https://github.com/Finschia/finschia-sdk/pull/1120) Update links in x/foundation README.md

diff --git a/api/go.mod b/api/go.mod
@@ -5,6 +5,7 @@ go 1.21
 toolchain go1.21.5
 
 require (
+	cosmossdk.io/api v0.7.2
 	github.com/cosmos/cosmos-proto v1.0.0-beta.3
 	github.com/cosmos/cosmos-sdk v0.50.2
 	github.com/cosmos/gogoproto v1.4.11
@@ -14,7 +15,6 @@ require (
 )
 
 require (
-	cosmossdk.io/api v0.7.2 // indirect
 	cosmossdk.io/collections v0.4.0 // indirect
 	cosmossdk.io/core v0.11.0 // indirect
 	cosmossdk.io/depinject v1.0.0-alpha.4 // indirect

diff --git a/go.work.example b/go.work.example
@@ -6,5 +6,7 @@ use (
 	.
 	./api
 	./simapp
+	./tests
+	./x/foundation
 	./x/bankplus
 )
diff --git a/proto/buf.gen.pulsar.yaml b/proto/buf.gen.pulsar.yaml
@@ -12,10 +12,10 @@ managed:
 plugins:
   - name: go-pulsar
     out: ../api
-    opt: paths=source_relative
+    opt: paths=source_relative,Mcosmos/app/v1alpha1/module.proto=cosmossdk.io/api/cosmos/app/v1alpha1
   - name: go-grpc
     out: ../api
-    opt: paths=source_relative
+    opt: paths=source_relative,Mcosmos/app/v1alpha1/module.proto=cosmossdk.io/api/cosmos/app/v1alpha1
   - name: go-cosmos-orm
     out: ../api
-    opt: paths=source_relative
+    opt: paths=source_relative,Mcosmos/app/v1alpha1/module.proto=cosmossdk.io/api/cosmos/app/v1alpha1
diff --git a/scripts/mockgen.sh b/scripts/mockgen.sh
@@ -1,30 +1,4 @@
 #!/usr/bin/env bash
 
 mockgen_cmd="mockgen"
-$mockgen_cmd -source=baseapp/abci_utils.go -package mock -destination baseapp/testutil/mock/mocks.go
-$mockgen_cmd -source=client/account_retriever.go -package mock -destination testutil/mock/account_retriever.go
-$mockgen_cmd -package mock -destination store/mock/cosmos_cosmos_db_DB.go github.com/cosmos/cosmos-db DB
-$mockgen_cmd -source=types/module/module.go -package mock -destination testutil/mock/types_module_module.go
-$mockgen_cmd -source=types/module/mock_appmodule_test.go -package mock -destination testutil/mock/types_mock_appmodule.go
-$mockgen_cmd -source=types/invariant.go -package mock -destination testutil/mock/types_invariant.go
-$mockgen_cmd -package mock -destination testutil/mock/grpc_server.go github.com/cosmos/gogoproto/grpc Server
-$mockgen_cmd -package mock -destination testutil/mock/logger.go cosmossdk.io/log Logger
-$mockgen_cmd -source=orm/model/ormtable/hooks.go -package ormmocks -destination orm/testing/ormmocks/hooks.go
-$mockgen_cmd -source=x/nft/expected_keepers.go -package testutil -destination x/nft/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/feegrant/expected_keepers.go -package testutil -destination x/feegrant/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/mint/types/expected_keepers.go -package testutil -destination x/mint/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/params/proposal_handler_test.go -package testutil -destination x/params/testutil/staking_keeper_mock.go
-$mockgen_cmd -source=x/crisis/types/expected_keepers.go -package testutil -destination x/crisis/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/auth/tx/config/expected_keepers.go -package testutil -destination x/auth/tx/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/auth/types/expected_keepers.go -package testutil -destination x/auth/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/auth/ante/expected_keepers.go -package testutil -destination x/auth/ante/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/authz/expected_keepers.go -package testutil -destination x/authz/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/bank/types/expected_keepers.go -package testutil -destination x/bank/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/group/testutil/expected_keepers.go -package testutil -destination x/group/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/evidence/types/expected_keepers.go -package testutil -destination x/evidence/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/distribution/types/expected_keepers.go -package testutil -destination x/distribution/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/slashing/types/expected_keepers.go -package testutil -destination x/slashing/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/genutil/types/expected_keepers.go -package testutil -destination x/genutil/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/gov/testutil/expected_keepers.go -package testutil -destination x/gov/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/staking/types/expected_keepers.go -package testutil -destination x/staking/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/auth/vesting/types/expected_keepers.go -package testutil -destination x/auth/vesting/testutil/expected_keepers_mocks.go
+$mockgen_cmd -source=x/foundation/expected_keepers.go -package testutil -destination x/foundation/testutil/expected_keepers_mocks.go