Skip to content

Commit 4a073fa

Browse files
julienrbrtjulienrbrt
authored
chore: remove simapp v1 (#23009)
1 parent 150f2d6 commit 4a073fa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+195
-6120
lines changed

‎.github/workflows/build.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
runs-on: ubuntu-latest
1919
strategy:
2020
matrix:
21-
# go-arch: ["amd64", "arm", "arm64"]
2221
go-arch: ["amd64", "arm64"] # drop 32 bit support for now (and maybe forever)
2322
steps:
2423
- uses: actions/checkout@v4
@@ -48,19 +47,17 @@ jobs:
4847
###################
4948
#### Build App ####
5049
###################
51-
- name: Build
52-
run: GOARCH=${{ matrix.go-arch }} make build
5350
- name: Build v2
5451
run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS=v2 make build
5552
- name: Build with rocksdb backend
5653
if: matrix.go-arch == 'amd64'
57-
run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS="rocksdb" make build
54+
run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS=v2,rocksdb make build
5855
- name: Build with BLS12381
5956
if: matrix.go-arch == 'amd64'
60-
run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS="bls12381" make build
57+
run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS=v2,bls12381 make build
6158
- name: Build with Secp_cgo
6259
if: matrix.go-arch == 'amd64'
63-
run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS="secp" make build
60+
run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS=v2,secp make build
6461
###################
6562
## Build Tooling ##
6663
###################

‎.github/workflows/sims-047.yml

-145
This file was deleted.

‎.github/workflows/test.yml

-63
Original file line numberDiff line numberDiff line change
@@ -114,46 +114,6 @@ jobs:
114114
name: "${{ github.sha }}-integration-coverage"
115115
path: ./tests/integration-profile.out
116116

117-
test-system: # v2 system tests are in v2-test.yml
118-
runs-on: ubuntu-latest
119-
steps:
120-
- uses: actions/checkout@v4
121-
with:
122-
fetch-tags: true
123-
- uses: actions/setup-go@v5
124-
with:
125-
go-version: "1.23"
126-
check-latest: true
127-
cache: true
128-
cache-dependency-path: |
129-
simapp/go.sum
130-
systemtest/go.sum
131-
- uses: technote-space/[email protected]
132-
id: git_diff
133-
with:
134-
PATTERNS: |
135-
**/*.go
136-
go.mod
137-
go.sum
138-
**/go.mod
139-
**/go.sum
140-
**/Makefile
141-
Makefile
142-
- name: Install musl lib for simd (docker) binary
143-
if: env.GIT_DIFF
144-
run: |
145-
sudo apt-get install -y musl
146-
- name: system tests v1
147-
if: env.GIT_DIFF
148-
run: |
149-
make test-system
150-
- uses: actions/upload-artifact@v4
151-
if: failure()
152-
with:
153-
name: "testnet-setup"
154-
path: ./systemtests/testnet/
155-
retention-days: 3
156-
157117
repo-analysis:
158118
runs-on: ubuntu-latest
159119
needs: [tests, test-integration]
@@ -504,29 +464,6 @@ jobs:
504464
with:
505465
projectBaseDir: indexer/postgres/
506466

507-
test-simapp:
508-
runs-on: ubuntu-latest
509-
steps:
510-
- uses: actions/checkout@v4
511-
- uses: actions/setup-go@v5
512-
with:
513-
go-version: "1.23"
514-
check-latest: true
515-
cache: true
516-
cache-dependency-path: simapp/go.sum
517-
- uses: technote-space/[email protected]
518-
id: git_diff
519-
with:
520-
PATTERNS: |
521-
**/*.go
522-
simapp/go.mod
523-
simapp/go.sum
524-
- name: tests simapp
525-
if: env.GIT_DIFF
526-
run: |
527-
cd simapp
528-
go test -mod=readonly -timeout 30m -tags='norace ledger test_ledger_mock' ./...
529-
530467
test-simapp-v2:
531468
runs-on: ubuntu-latest
532469
steps:

‎docs/build/packages/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,3 @@ For more information on SDK tooling, see the [Tooling](https://docs.cosmos.netwo
5050
## Example
5151

5252
* [SimApp v2](https://pkg.go.dev/cosmossdk.io/simapp/v2) - SimApp/v2 is **the** sample Cosmos SDK v2 chain. This package should not be imported in your application.
53-
* [SimApp](https://pkg.go.dev/cosmossdk.io/simapp) - SimApp is **the** sample Cosmos SDK chain. This package should not be imported in your application.

‎go.work.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use (
1414
./log
1515
./math
1616
./orm
17-
./simapp
17+
./simapp/v2
1818
./tests
1919
./tests/systemtests
2020
./schema

‎scripts/build/build.mk

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ MOCKS_DIR = $(CURDIR)/tests/mocks
1212
HTTPS_GIT := https://github.com/cosmos/cosmos-sdk.git
1313
DOCKER := $(shell which docker)
1414
PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
15+
COSMOS_BUILD_OPTIONS := v2
1516

1617
rocksdb_version=v9.6.1
1718

‎scripts/build/simulations.mk

+31-32
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
# TODO: This should be ported to work with SimApp v2.
12

23
#? test-sim-nondeterminism: Run non-determinism test for simapp
34
test-sim-nondeterminism:
4-
@echo "Running non-determinism test..."
5-
@cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout=30m -tags='sims' -run TestAppStateDeterminism \
6-
-NumBlocks=100 -BlockSize=200 -Period=0
5+
# @echo "Running non-determinism test..."
6+
# @cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout=30m -tags='sims' -run TestAppStateDeterminism \
7+
# -NumBlocks=100 -BlockSize=200 -Period=0
78

89
# Requires an exported plugin. See store/streaming/README.md for documentation.
910
#
@@ -15,49 +16,47 @@ test-sim-nondeterminism:
1516
# export COSMOS_SDK_ABCI_V1=<path-to-sdk>/store/streaming/abci/examples/file/file
1617
# make test-sim-nondeterminism-streaming
1718
test-sim-nondeterminism-streaming:
18-
@echo "Running non-determinism-streaming test..."
19-
@cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout=30m -tags='sims' -run TestAppStateDeterminism \
20-
-NumBlocks=100 -BlockSize=200 -Period=0 -EnableStreaming=true
19+
# @echo "Running non-determinism-streaming test..."
20+
# @cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout=30m -tags='sims' -run TestAppStateDeterminism \
21+
# -NumBlocks=100 -BlockSize=200 -Period=0 -EnableStreaming=true
2122

2223
test-sim-custom-genesis-fast:
23-
@echo "Running custom genesis simulation..."
24-
@echo "By default, ${HOME}/.simapp/config/genesis.json will be used."
25-
@cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout=30m -tags='sims' -run TestFullAppSimulation -Genesis=${HOME}/.simapp/config/genesis.json \
26-
-NumBlocks=100 -BlockSize=200 -Seed=99 -Period=5 -SigverifyTx=false
24+
# @echo "Running custom genesis simulation..."
25+
# @echo "By default, ${HOME}/.simapp/config/genesis.json will be used."
26+
# @cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout=30m -tags='sims' -run TestFullAppSimulation -Genesis=${HOME}/.simapp/config/genesis.json \
27+
# -NumBlocks=100 -BlockSize=200 -Seed=99 -Period=5 -SigverifyTx=false
2728

2829
test-sim-import-export:
29-
@echo "Running application import/export simulation. This may take several minutes..."
30-
@cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout 20m -tags='sims' -run TestAppImportExport \
31-
-NumBlocks=50 -Period=5
30+
# @echo "Running application import/export simulation. This may take several minutes..."
31+
# @cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout 20m -tags='sims' -run TestAppImportExport \
32+
# -NumBlocks=50 -Period=5
3233

3334
test-sim-after-import:
34-
@echo "Running application simulation-after-import. This may take several minutes..."
35-
@cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout 30m -tags='sims' -run TestAppSimulationAfterImport \
36-
-NumBlocks=50 -Period=5
37-
35+
# @echo "Running application simulation-after-import. This may take several minutes..."
36+
# @cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout 30m -tags='sims' -run TestAppSimulationAfterImport \
37+
# -NumBlocks=50 -Period=5
3838

3939
test-sim-custom-genesis-multi-seed:
40-
@echo "Running multi-seed custom genesis simulation..."
41-
@echo "By default, ${HOME}/.simapp/config/genesis.json will be used."
42-
@cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout 30m -tags='sims' -run TestFullAppSimulation -Genesis=${HOME}/.simapp/config/genesis.json \
43-
-NumBlocks=400 -Period=5
40+
# @echo "Running multi-seed custom genesis simulation..."
41+
# @echo "By default, ${HOME}/.simapp/config/genesis.json will be used."
42+
# @cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout 30m -tags='sims' -run TestFullAppSimulation -Genesis=${HOME}/.simapp/config/genesis.json \
43+
# -NumBlocks=400 -Period=5
4444

4545
test-sim-multi-seed-long:
46-
@echo "Running long multi-seed application simulation. This may take awhile!"
47-
@cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout=2h -tags='sims' -run TestFullAppSimulation \
48-
-NumBlocks=150 -Period=50
46+
# @echo "Running long multi-seed application simulation. This may take awhile!"
47+
# @cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout=2h -tags='sims' -run TestFullAppSimulation \
48+
# -NumBlocks=150 -Period=50
4949

5050
test-sim-multi-seed-short:
51-
@echo "Running short multi-seed application simulation. This may take awhile!"
52-
@cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout 30m -tags='sims' -run TestFullAppSimulation \
53-
-NumBlocks=50 -Period=10 -FauxMerkle=true
54-
51+
# @echo "Running short multi-seed application simulation. This may take awhile!"
52+
# @cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -timeout 30m -tags='sims' -run TestFullAppSimulation \
53+
# -NumBlocks=50 -Period=10 -FauxMerkle=true
5554

5655
test-sim-benchmark-invariants:
57-
@echo "Running simulation invariant benchmarks..."
58-
cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -benchmem -bench=BenchmarkInvariants -tags='sims' -run=^$ \
59-
-Enabled=true -NumBlocks=1000 -BlockSize=200 \
60-
-Period=1 -Commit=true -Seed=57 -v -timeout 24h
56+
# @echo "Running simulation invariant benchmarks..."
57+
# cd ${CURRENT_DIR}/simapp && go test -failfast -mod=readonly -benchmem -bench=BenchmarkInvariants -tags='sims' -run=^$ \
58+
# -Enabled=true -NumBlocks=1000 -BlockSize=200 \
59+
# -Period=1 -Commit=true -Seed=57 -v -timeout 24h
6160

6261
.PHONY: \
6362
test-sim-nondeterminism \

‎scripts/init-simapp.sh

-22
This file was deleted.

0 commit comments

Comments
 (0)