Merge branch 'main' into austin/ENG-974

.github/workflows/test.yml

@@ -82,27 +82,6 @@ jobs:
           make test-rpc
         if: env.GIT_DIFF
 
-  test-e2e:
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.19
-          check-latest: true
-      - uses: actions/checkout@v3
-      - uses: technote-space/[email protected]
-        with:
-          PATTERNS: |
-            **/**.sol
-            **/**.go
-            go.mod
-            go.sum
-      - name: Test e2e
-        run: |
-          make test-integration
-        if: env.GIT_DIFF
-
   integration_tests:
     runs-on: ubuntu-latest
     steps:

Makefile

@@ -328,9 +328,6 @@ test-import:
 test-rpc:
 	./scripts/integration-test-all.sh -t "rpc" -q 1 -z 1 -s 2 -m "rpc" -r "true"
 
-test-integration:
-	./scripts/integration-test-all.sh -t "integration" -q 1 -z 1 -s 2 -m "integration" -r "true"
-
 run-integration-tests:
 	@nix-shell ./tests/integration_tests/shell.nix --run ./scripts/run-integration-tests.sh
 

scripts/integration-test-all.sh

@@ -141,17 +141,6 @@ echo "done sleeping"
 
 set +e
 
-if [[ -z $TEST || $TEST == "integration" ]] ; then
-    time_out=300s
-
-    for i in $(seq 1 "$TEST_QTD"); do
-        HOST_RPC=http://$IP_ADDR:$RPC_PORT"$i"
-        echo "going to test ethermint node $HOST_RPC ..."
-        MODE=$MODE HOST=$HOST_RPC go test ./tests/e2e/... -timeout=$time_out -v -short
-        TEST_FAIL=$?
-    done
-fi
-
 if [[ -z $TEST || $TEST == "rpc" ||  $TEST == "pending" ]]; then
     time_out=300s
     if [[ $TEST == "pending" ]]; then
@@ -186,7 +175,7 @@ for i in "${arr[@]}"; do
     stop_func "$i"
 done
 
-if [[ (-z $TEST || $TEST == "rpc" || $TEST == "integration" ) && $TEST_FAIL -ne 0 ]]; then
+if [[ (-z $TEST || $TEST == "rpc") && $TEST_FAIL -ne 0 ]]; then
     exit $TEST_FAIL
 else
     exit 0

tests/solidity/yarn.lock

@@ -11043,9 +11043,9 @@ loader-runner@^2.3.0:
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
 loader-utils@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz#278ad7006660bccc4d2c0c1578e17c5c78d5c0e0"
-  integrity sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"