From ffaa90959e612e8db6c4865e8c59e0021be716fe Mon Sep 17 00:00:00 2001 From: mukundrawat Date: Tue, 22 Nov 2022 11:45:17 +0530 Subject: [PATCH] Merge branch 'deepanshutr/migration' of https://github.com/AssetMantle/modules into mukund/setup # Conflicts: # modules/assets/internal/mappable/mappable_test.go # modules/classifications/internal/mappable/mappable_test.go # modules/identities/internal/mappable/mappable_test.go # schema/data/base/listData_test.go # schema/documents/base/document_test.go --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a740093a7..9c43cf603 100644 --- a/Makefile +++ b/Makefile @@ -78,8 +78,7 @@ test-sim-custom-genesis-fast: -Enabled=true -NumBlocks=100 -BlockSize=200 -Commit=true -Seed=99 -Period=5 -v -timeout 24h test-sim-full-application: - @echo "Running custom genesis simulation..." - @echo "By default, ${HOME}/.assetNode/config/genesis.json will be used." + @echo "Running full app..." @go test -mod=readonly $(SIMAPP) -run=TestFullAppSimulation \ -Enabled=true -NumBlocks=100 -BlockSize=200 -Commit=true -Seed=99 -Period=5 -v -timeout 24h @@ -87,6 +86,7 @@ test-sim-import-export: runsim @echo "Running application import/export simulation. This may take several minutes..." @$(BINDIR)/runsim -Jobs=4 -SimAppPkg=$(SIMAPP) 50 5 TestAppImportExport + test-sim-after-import: runsim @echo "Running application simulation-after-import. This may take several minutes..." @$(BINDIR)/runsim -Jobs=4 -SimAppPkg=$(SIMAPP) 50 5 TestAppSimulationAfterImport @@ -111,6 +111,7 @@ test-sim-benchmark-invariants: -Period=1 -Commit=true -Seed=57 -v -timeout 24h .PHONY: \ +test-sim-full-application \ test-sim-nondeterminism \ test-sim-custom-genesis-fast \ test-sim-import-export \