Skip to content

Commit

Permalink
Merge branch 'deepanshutr/migration' of https://github.com/AssetMantl…
Browse files Browse the repository at this point in the history
…e/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
  • Loading branch information
mukundrawat committed Nov 21, 2022
1 parent e01255d commit 6ed75e7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
12 changes: 10 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,23 @@ test-race:

.PHONY: test test-all test-ledger-mock test-ledger test-unit test-race

run-simulations: test-sim-custom-genesis-fast test-sim-nondeterminism test-sim-import-export test-sim-after-import test-sim-custom-genesis-multi-seed test-sim-multi-seed-long test-sim-multi-seed-short test-sim-benchmark-invariants

test-sim-nondeterminism:
@echo "Running non-determinism test..."
@go test -mod=readonly $(SIMAPP) -run TestAppStateDeterminism -Enabled=true \
@go test -mod=readonly $(SIMAPP) -run=TestAppStateDeterminism -Enabled=true \
-NumBlocks=100 -BlockSize=200 -Commit=true -Period=0 -v -timeout 24h

test-sim-custom-genesis-fast:
@echo "Running custom genesis simulation..."
@echo "By default, ${HOME}/.assetNode/config/genesis.json will be used."
@go test -mod=readonly $(SIMAPP) -run TestFullAppSimulation -Genesis=${HOME}/.assetNode/config/genesis.json \
@go test -mod=readonly $(SIMAPP) -run=TestFullAppSimulation -Genesis=${HOME}/.assetNode/config/genesis.json \
-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."
@go test -mod=readonly $(SIMAPP) -run=TestFullAppSimulation \
-Enabled=true -NumBlocks=100 -BlockSize=200 -Commit=true -Seed=99 -Period=5 -v -timeout 24h

test-sim-import-export: runsim
Expand Down
2 changes: 0 additions & 2 deletions schema/codec.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
typesSchema "github.com/AssetMantle/modules/schema/types"
baseTypes "github.com/AssetMantle/modules/schema/types/base"
"github.com/cosmos/cosmos-sdk/codec"
typesGov "github.com/cosmos/cosmos-sdk/x/gov/types"
)

func RegisterCodec(codec *codec.Codec) {
Expand Down Expand Up @@ -58,7 +57,6 @@ func RegisterCodec(codec *codec.Codec) {

traits.RegisterCodec(codec)

typesGov.RegisterCodec(codec)
typesSchema.RegisterCodec(codec)
baseTypes.RegisterCodec(codec)
}
2 changes: 1 addition & 1 deletion simulation/make/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ tools: runsim
runsim: $(RUNSIM)
$(RUNSIM):
@echo "Installing runsim..."
@(cd /tmp && go get github.com/cosmos/tools/cmd/[email protected])
@(cd /tmp && go install github.com/cosmos/tools/cmd/[email protected])

tools-clean:
rm -f $(RUNSIM)
Expand Down

0 comments on commit 6ed75e7

Please sign in to comment.