Update Goth dependencies (#2771)

Update Goth dependencies and version

.github/workflows/integration-test.yml

@@ -30,7 +30,7 @@ jobs:
 
   integration-test-groups:
     name: Integration Tests (hybrid-net) group
-    runs-on: [goth, ubuntu-18.04]
+    runs-on: [goth2, ubuntu-22.04]
     needs: test_check
     strategy:
       matrix:
@@ -48,17 +48,16 @@ jobs:
       - name: Configure Python
         uses: actions/setup-python@v2
         with:
-          python-version: "3.8.0"
+          python-version: "3.10"
 
       - name: Configure Poetry
         uses: Gr1N/setup-poetry@v8
         with:
-          poetry-version: 1.2.2
+          poetry-version: 1.6.1
           working-directory: "./goth_tests"
 
       - name: Install dependencies
         run: |
-          poetry config experimental.new-installer false
           poetry install --no-root
 
       - name: Disconnect Docker containers from default network
@@ -113,7 +112,7 @@ jobs:
         # Python version below should agree with the version set up by this job.
         # In the future we'll be able to use the `--all` flag here to remove envs for
         # all Python versions (https://github.com/python-poetry/poetry/issues/3208).
-        run: poetry env remove python3.8
+        run: poetry env remove --all
 
   integration-test:
     name: Integration Tests (hybrid-net)

goth_tests/README.md

@@ -251,7 +251,9 @@ docker-compose:
     # release-tag: ...
 
   compose-log-patterns:                         # Log message patterns used for container ready checks
-    ethereum: ".*Wallets supplied."
+    ethereum-mainnet: ".*Wallets supplied."
+    ethereum-goerli: ".*Wallets supplied."
+    ethereum-polygon: ".*Wallets supplied."
     ...
 
 key-dir: "keys"                                 # Where to look for pre-funded Ethereum keys

goth_tests/assets/docker/docker-compose.yml

@@ -24,20 +24,24 @@ services:
             # we map them to ports 16001-16100 on the host.
             - "16001-16100:6001-6100"
 
-    ethereum:
-        image: docker.pkg.github.com/golemfactory/gnt2/gnt2-docker-yagna:483c6f241edd
-        ports:
-            - "8545:8545"
+    # currently unused, but useful to testing payments on different networks
+    ethereum-mainnet:
+        image: docker.pkg.github.com/golemfactory/gnt2/gnt2-docker-yagna:a93c126e8255
+        environment:
+            - GANACHE_CHAIN_ID=1
 
-    zksync:
-        image: docker.pkg.github.com/golemfactory/yagna-zksync/yagna-zksync-mock:fddc527d2bf1
-        ports:
-            - "3030:3030"
+    # default payment network
+    ethereum-goerli:
+        image: docker.pkg.github.com/golemfactory/gnt2/gnt2-docker-yagna:a93c126e8255
         environment:
-            - WEB3_PROVIDER_URI=http://ethereum:8545
-        depends_on:
-            - ethereum
-
+            - GANACHE_CHAIN_ID=5
+
+    # currently unused, but useful to testing payments on different networks
+    ethereum-polygon:
+        image: docker.pkg.github.com/golemfactory/gnt2/gnt2-docker-yagna:a93c126e8255
+        environment:
+            - GANACHE_CHAIN_ID=137
+
     outbound-test:
         # A service running a TCP sink, echo and iperf3 servers
         image: outbound-test

goth_tests/domain/exe_units/goth-config.yml

@@ -22,8 +22,9 @@ docker-compose:
     # release-tag: ...
 
   compose-log-patterns:
-    ethereum: ".*Wallets supplied."
-    zksync: ".*Running on http://.*:3030/.*"
+    ethereum-mainnet: ".*Wallets supplied."
+    ethereum-goerli: ".*Wallets supplied."
+    ethereum-polygon: ".*Wallets supplied."
 
 
 key-dir: "../../assets/keys"

goth_tests/domain/payments/goth-config.yml

@@ -22,8 +22,9 @@ docker-compose:
     # release-tag: ...
 
   compose-log-patterns:
-    ethereum: ".*Wallets supplied."
-    zksync: ".*Running on http://.*:3030/.*"
+    ethereum-mainnet: ".*Wallets supplied."
+    ethereum-goerli: ".*Wallets supplied."
+    ethereum-polygon: ".*Wallets supplied."
 
 
 key-dir: "../../assets/keys"

goth_tests/domain/ya-provider/goth-config.yml

@@ -22,8 +22,9 @@ docker-compose:
     # release-tag: ...
 
   compose-log-patterns:
-    ethereum: ".*Wallets supplied."
-    zksync: ".*Running on http://.*:3030/.*"
+    ethereum-mainnet: ".*Wallets supplied."
+    ethereum-goerli: ".*Wallets supplied."
+    ethereum-polygon: ".*Wallets supplied."
 
 
 key-dir: "../../assets/keys"

goth_tests/goth-config.yml

@@ -21,8 +21,9 @@ docker-compose:
     # release-tag: ...
 
   compose-log-patterns:
-    ethereum: ".*Wallets supplied."
-    zksync: ".*Running on http://.*:3030/.*"
+    ethereum-mainnet: ".*Wallets supplied."
+    ethereum-goerli: ".*Wallets supplied."
+    ethereum-polygon: ".*Wallets supplied."
 
 key-dir: "assets/keys"
 

goth_tests/pyproject.toml

@@ -24,22 +24,22 @@ readme = "README.md"
 # secondary = true
 
 [tool.poetry.dependencies]
-python = "^3.8.0"
-pytest = "^6.2"
-pytest-asyncio = "^0.20.2"
+python = "^3.10.1"
+pytest = "^7.4"
+pytest-asyncio = "0.21"
 pytest-rerunfailures = "^10.3"
 pytest-split = "^0.8.1"
-goth = "0.15.3"
+# goth = "0.15.3"
 # to use development goth version uncomment below
-# goth =  { git = "https://github.com/golemfactory/goth.git", rev = "f399163b9f3882cca4ca4152c06aed57b916ca67" }
+goth =  { git = "https://github.com/golemfactory/goth.git", rev = "1aa00bf9706de9464af5b06cd44416b54455f0ae" }
 
 [tool.poetry.dev-dependencies]
-black = "^20.8b1"
-mypy = "^0.782"
-poethepoet = "^0.10.0"
+black = "21.7b0"
+mypy = "^1.5"
+poethepoet = "^0.22"
 
 [tool.poe.tasks]
 codestyle = "black --check --diff ."
-goth-tests = "pytest -svx . --reruns 3 --only-rerun AssertionError --only-rerun TimeoutError --only-rerun ApiException --only-rerun goth.runner.exceptions.TemporalAssertionError --only-rerun urllib.error.URLError --only-rerun goth.runner.exceptions.CommandError"
+goth-tests = "pytest -W ignore::DeprecationWarning -svx . --reruns 3 --only-rerun AssertionError --only-rerun TimeoutError --only-rerun ApiException --only-rerun goth.runner.exceptions.TemporalAssertionError --only-rerun urllib.error.URLError --only-rerun goth.runner.exceptions.CommandError"
 provider-tests = "pytest -svx ./domain/ya-provider"
 typecheck = "mypy ."