Merge branch 'main' into fedekunze/bump-sdk

.github/workflows/test.yml

@@ -55,26 +55,25 @@ jobs:
           fail_ci_if_error: true
         if: env.GIT_DIFF
 
-  # TODO: refactor before enabling
-  # test-importer:
-  #   runs-on: ubuntu-latest
-  #   timeout-minutes: 10
-  #   steps:
-  #     - uses: actions/[email protected]
-  #     - uses: actions/[email protected]
-  #       with:
-  #         go-version: 1.17
-  #     - uses: technote-space/get-diff-action@v5
-  #       id: git_diff
-  #       with:
-  #         SUFFIX_FILTER: |
-  #           .go
-  #           .mod
-  #           .sum
-  #     - name: test-importer
-  #       run: |
-  #         make test-import
-  #       if: "env.GIT_DIFF != ''"
+  test-importer:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - uses: actions/[email protected]
+        with:
+          go-version: 1.17
+      - uses: actions/checkout@v2
+      - uses: technote-space/get-diff-action@v5
+        id: git_diff
+        with:
+          SUFFIX_FILTER: |
+            .go
+            .mod
+            .sum
+      - name: test-importer
+        run: |
+          make test-import
+        if: "env.GIT_DIFF != ''"
 
   test-solidity:
     runs-on: ubuntu-latest

Makefile

@@ -257,7 +257,7 @@ godocs:
 
 test: test-unit
 test-all: test-unit test-race
-PACKAGES_UNIT=$(shell go list ./...)
+PACKAGES_UNIT=$(shell go list ./... | grep -Ev 'vendor|importer')
 TEST_PACKAGES=./...
 TEST_TARGETS := test-unit test-unit-cover test-race
 
@@ -282,9 +282,7 @@ else
 endif
 
 test-import:
-	@go test ./tests/importer -v --vet=off --run=TestImportBlocks --datadir tmp \
-	--blockchain blockchain
-	rm -rf tests/importer/tmp
+	go test -run TestImporterTestSuite -v --vet=off github.com/tharsis/ethermint/tests/importer
 
 test-rpc:
 	./scripts/integration-test-all.sh -t "rpc" -q 1 -z 1 -s 2 -m "rpc" -r "true"