Merge branch 'master' into kevin/fix-lint2

Author: khdegraaf

.github/workflows/go.yml

@@ -37,38 +37,3 @@ jobs:
         with:
           file: ./coverage.txt
           verbose: true
-
-  feature-toggle-margin-cli-alpha:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v2
-        with:
-          go-version: ^1.15
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Get dependencies
-        run: |
-          go get -v -t -d ./...
-
-      - name: Build
-        run: FEATURE_TOGGLE_MARGIN_CLI_ALPHA=1 make install
-
-      - name: Test
-        run: |
-          go test -tags "FEATURE_TOGGLE_MARGIN_CLI_ALPHA" -v ./... -coverprofile=coverage.txt -covermode=atomic -coverpkg $(go list ./... | grep -v test | tr "\n" ",")
-          excludelist="$(find ./ -type f -name '*.go' | xargs grep -l 'DONTCOVER')"
-          for filename in ${excludelist}; do
-            filename=$(echo $filename | sed 's/^../github.com\/Sifchain\/sifnode/g')
-            echo "Excluding ${filename} from coverage report..."
-            sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt
-          done
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v3
-        with:
-          file: ./coverage.txt
-          verbose: true

.github/workflows/integrationtest1.yml

@@ -5,7 +5,7 @@ on:
       - "ui/**"
 
 jobs:
-  test:
+  integration:
     timeout-minutes: 40
     runs-on: ubuntu-20.04
     steps:

.github/workflows/integrationtest2.yml

@@ -5,7 +5,7 @@ on:
       - "ui/**"
 
 jobs:
-  test:
+  integration:
     timeout-minutes: 40
     runs-on: ubuntu-20.04
     steps:

.github/workflows/integrationtest3.yml

@@ -5,7 +5,7 @@ on:
       - "ui/**"
 
 jobs:
-  test:
+  integration:
     timeout-minutes: 40
     runs-on: ubuntu-20.04
     steps:

.github/workflows/localnet.yml

@@ -4,6 +4,7 @@ on: [push]
 
 jobs:
   build:
+    if: ${{ false }}
     name: Build Stack
     defaults:
       run:

Makefile

@@ -12,13 +12,6 @@ DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bu
 
 GOFLAGS:=""
 GOTAGS:=
-ifeq ($(FEATURE_TOGGLE_SDK_045), 1)
-	GOFLAGS:="-modfile=go_FEATURE_TOGGLE_SDK_045.mod"
-	GOTAGS:=$(GOTAGS)FEATURE_TOGGLE_SDK_045,
-endif
-ifeq ($(FEATURE_TOGGLE_MARGIN_CLI_ALPHA), 1)
-	GOTAGS:=$(GOTAGS)FEATURE_TOGGLE_MARGIN_CLI_ALPHA,
-endif
 
 ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=sifchain \
 		  -X github.com/cosmos/cosmos-sdk/version.ServerName=sifnoded \