From 68654e3c4599900d2053fac8e3914388fdaeae8b Mon Sep 17 00:00:00 2001 From: puneetmahajan Date: Fri, 21 Nov 2025 12:48:49 +0530 Subject: [PATCH 1/4] refactor makefile --- Makefile | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/Makefile b/Makefile index dfb65bf7e..50272db5f 100644 --- a/Makefile +++ b/Makefile @@ -17,50 +17,6 @@ all: lint test # The below include contains the tools and runsim targets. include contrib/devtools/Makefile -############################################################################### -### Build ### -############################################################################### - -BUILD_TARGETS := build install - -build: BUILD_ARGS=-o $(BUILDDIR)/ -build-linux: - GOOS=linux GOARCH=amd64 LEDGER_ENABLED=false $(MAKE) build - -$(BUILD_TARGETS): go.sum $(BUILDDIR)/ - go $@ -mod=readonly $(BUILD_FLAGS) $(BUILD_ARGS) ./... - -$(BUILDDIR)/: - mkdir -p $(BUILDDIR)/ - -build-simd-all: go.sum - $(DOCKER) rm latest-build || true - $(DOCKER) run --volume=$(CURDIR):/sources:ro \ - --env TARGET_PLATFORMS='linux/amd64 darwin/amd64 linux/arm64 windows/amd64' \ - --env APP=simd \ - --env VERSION=$(VERSION) \ - --env COMMIT=$(COMMIT) \ - --env LEDGER_ENABLED=$(LEDGER_ENABLED) \ - --name latest-build cosmossdk/rbuilder:latest - $(DOCKER) cp -a latest-build:/home/builder/artifacts/ $(CURDIR)/ - -build-simd-linux: go.sum $(BUILDDIR)/ - $(DOCKER) rm latest-build || true - $(DOCKER) run --volume=$(CURDIR):/sources:ro \ - --env TARGET_PLATFORMS='linux/amd64' \ - --env APP=simd \ - --env VERSION=$(VERSION) \ - --env COMMIT=$(COMMIT) \ - --env LEDGER_ENABLED=false \ - --name latest-build cosmossdk/rbuilder:latest - $(DOCKER) cp -a latest-build:/home/builder/artifacts/ $(CURDIR)/ - cp artifacts/simd-*-linux-amd64 $(BUILDDIR)/simd - -cosmovisor: - $(MAKE) -C cosmovisor cosmovisor - -.PHONY: build build-linux build-simd-all build-simd-linux cosmovisor - distclean: clean tools-clean clean: rm -rf \ From ffdaf7b5dbea692931b9df65f1c4b86e8dff7f48 Mon Sep 17 00:00:00 2001 From: puneetmahajan Date: Fri, 21 Nov 2025 12:49:40 +0530 Subject: [PATCH 2/4] fix lint --- x/halving/module.go | 3 --- x/halving/types/codec.go | 2 +- x/interchainquery/types/codec.go | 2 +- x/oracle/types/codec.go | 2 +- x/pob/types/codec.go | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/x/halving/module.go b/x/halving/module.go index 9aabd4452..573721988 100644 --- a/x/halving/module.go +++ b/x/halving/module.go @@ -104,9 +104,6 @@ func (AppModule) Name() string { return types.ModuleName } -// RegisterInvariants registers the halving module invariants. -func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} - // ConsensusVersion returns the halving module's consensus version number. func (am AppModule) ConsensusVersion() uint64 { return 1 diff --git a/x/halving/types/codec.go b/x/halving/types/codec.go index 6735901db..1eaab53e6 100644 --- a/x/halving/types/codec.go +++ b/x/halving/types/codec.go @@ -22,7 +22,7 @@ var ( // // The actual codec used for serialization should be provided to x/halving and // defined at the application level. - ModuleCdc = codec.NewAminoCodec(amino) + ModuleCdc = amino ) func init() { diff --git a/x/interchainquery/types/codec.go b/x/interchainquery/types/codec.go index d5671f6a5..3aad5940c 100644 --- a/x/interchainquery/types/codec.go +++ b/x/interchainquery/types/codec.go @@ -10,7 +10,7 @@ import ( var ( amino = codec.NewLegacyAmino() - ModuleCdc = codec.NewAminoCodec(amino) + ModuleCdc = amino ) func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { diff --git a/x/oracle/types/codec.go b/x/oracle/types/codec.go index bfca7c72a..acf977220 100644 --- a/x/oracle/types/codec.go +++ b/x/oracle/types/codec.go @@ -17,7 +17,7 @@ var ( // // The actual codec used for serialization should be provided to x/staking and // defined at the application level. - ModuleCdc = codec.NewAminoCodec(amino) + ModuleCdc = amino ) func init() { diff --git a/x/pob/types/codec.go b/x/pob/types/codec.go index 575e5df37..647c6b9d7 100644 --- a/x/pob/types/codec.go +++ b/x/pob/types/codec.go @@ -11,7 +11,7 @@ import ( var ( amino = codec.NewLegacyAmino() - ModuleCdc = codec.NewAminoCodec(amino) + ModuleCdc = amino ) func init() { From 7bb24f5b2c2e32c87a56cc49ee6ab43287136df7 Mon Sep 17 00:00:00 2001 From: puneetmahajan Date: Fri, 21 Nov 2025 12:52:33 +0530 Subject: [PATCH 3/4] fix testcov ci --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a14a94256..bcb54d841 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: - name: filter out DONTCOVER if: github.event_name == 'pull_request' run: | - excludelist="$(find ./ -type f -name '*.go' | xargs grep -l 'DONTCOVER')" + excludelist="$(find ./ -type f -name '*.go' | xargs grep -l 'DONTCOVER' || true)" excludelist+=" $(find ./ -type f -name '*.pb.go')" excludelist+=" $(find ./ -type f -name '*.pb.gw.go')" excludelist+=" $(find ./ -type f -path './tests/*.go')" From 9ddeb7f0f7566c44e6534f258fd0b4a0d0d0e267 Mon Sep 17 00:00:00 2001 From: puneetmahajan Date: Fri, 21 Nov 2025 13:05:06 +0530 Subject: [PATCH 4/4] udpate coverage --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bcb54d841..c1d150c9f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,6 +35,8 @@ jobs: excludelist+=" $(find ./ -type f -path './tests/*.go')" excludelist+=" $(find ./ -type f -path './x/interchainquery/*')" excludelist+=" $(find ./ -type f -path './x/oracle/*')" + excludelist+=" $(find ./ -type f -path './x/lsm/*')" + excludelist+=" $(find ./ -type f -path './x/pob/*')" for filename in ${excludelist}; do filename=$(echo $filename | sed 's/^.\///g') echo "Excluding ${filename} from coverage report..."