test: fix deploy-contract, lint checker

b-harvest · Nov 29, 2023 · 91c9611 · 91c9611
1 parent 85e716d
commit 91c9611
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/.github/workflows/deploy-contract.yml b/.github/workflows/deploy-contract.yml
@@ -17,6 +17,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: "1.21"
+          check-latest: true
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
@@ -25,4 +25,4 @@ jobs:
         run: |-
           echo 'GITHUB_TOKEN=${{secrets.GITHUB_TOKEN}}' > .release-env
       - name: release publish
-        run: make release
+        run: make release
diff --git a/scripts/proto-tools-installer.sh b/scripts/proto-tools-installer.sh
@@ -14,8 +14,8 @@ f_abort() {
     local l_rc=$1
     shift
 
-    echo $@ >&2
-    exit ${l_rc}
+    echo "$@" >&2
+    exit "${l_rc}"
 }
 
 case "${UNAME_S}" in
@@ -33,7 +33,7 @@ esac
 
 TEMPDIR="$(mktemp -d)"
 
-trap "rm -rvf ${TEMPDIR}" EXIT
+trap "rm -rvf '${TEMPDIR}'" EXIT
 
 f_print_installing_with_padding() {
     printf "Installing %30s ..." "$1" >&2
@@ -53,7 +53,7 @@ f_ensure_dirs() {
 }
 
 f_needs_install() {
-    if [ -x $1 ]; then
+    if [ -x "$1" ]; then
         echo -e "\talready installed. Skipping." >&2
         return 1
     fi
@@ -67,8 +67,8 @@ f_install_protoc() {
 
     pushd "${TEMPDIR}" >/dev/null
     curl -o "${PROTOC_ZIP}" -sSL "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/${PROTOC_ZIP}"
-    unzip -q -o ${PROTOC_ZIP} -d ${DESTDIR}/${PREFIX} bin/protoc; \
-    unzip -q -o ${PROTOC_ZIP} -d ${DESTDIR}/${PREFIX} 'include/*'; \
+    unzip -q -o ${PROTOC_ZIP} -d "${DESTDIR}"/${PREFIX} bin/protoc; \
+    unzip -q -o ${PROTOC_ZIP} -d "${DESTDIR}"/${PREFIX} 'include/*'; \
     rm -f ${PROTOC_ZIP}
     popd >/dev/null
     f_print_done

diff --git a/tests/integration_tests/test_upgrade.py b/tests/integration_tests/test_upgrade.py
@@ -170,11 +170,13 @@ def test_cosmovisor_upgrade(custom_ethermint: Ethermint):
     assert old_erc20_balance == contract.caller(
         block_identifier=target_height - 2
     ).balanceOf(ADDRS["validator"])
-    p = json.loads(cli.raw(
-        "query",
-        "ibc",
-        "client",
-        "params",
-        home=cli.data_dir,
-    ))
+    p = json.loads(
+        cli.raw(
+            "query",
+            "ibc",
+            "client",
+            "params",
+            home=cli.data_dir,
+        )
+    )
     assert p == {"allowed_clients": ["06-solomachine", "07-tendermint", "09-localhost"]}